diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-02-11 12:38:44 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-02-11 12:38:44 +0100 |
| commit | 5d763f2baa4ae928684b60171f26165ffa742691 (patch) | |
| tree | a2fa57ce8b7371422742bff11ca4e24723f2e26b /lib | |
| parent | 3e0951a2a1399cf402ac783910cf272655b3f78a (diff) | |
| parent | bcac798f6c44e21a6bdb2c5f8b056b364e246a35 (diff) | |
| download | kernel_samsung_crespo-5d763f2baa4ae928684b60171f26165ffa742691.zip kernel_samsung_crespo-5d763f2baa4ae928684b60171f26165ffa742691.tar.gz kernel_samsung_crespo-5d763f2baa4ae928684b60171f26165ffa742691.tar.bz2 | |
Merge branch 'linux-3.0.update' into cm.ics.new
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject_uevent.c | 2 | ||||
| -rw-r--r-- | lib/nlattr.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 70af0a7..ad72a03 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -282,7 +282,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, kobj_bcast_filter, kobj); /* ENOBUFS should be handled in userspace */ - if (retval == -ENOBUFS) + if (retval == -ENOBUFS || retval == -ESRCH) retval = 0; } else retval = -ENOMEM; diff --git a/lib/nlattr.c b/lib/nlattr.c index ac09f22..a8408b6 100644 --- a/lib/nlattr.c +++ b/lib/nlattr.c @@ -20,6 +20,7 @@ static const u16 nla_attr_minlen[NLA_TYPE_MAX+1] = { [NLA_U16] = sizeof(u16), [NLA_U32] = sizeof(u32), [NLA_U64] = sizeof(u64), + [NLA_MSECS] = sizeof(u64), [NLA_NESTED] = NLA_HDRLEN, }; |