diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-14 14:53:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-14 14:53:22 -0700 |
| commit | 0462bfc88d37ecb7f69488643c91cb657a1f264d (patch) | |
| tree | 0f307e998ca28deec27f8ed3e25098c86ef9545c /include/linux | |
| parent | 55815f70147dcfa3ead5738fd56d3574e2e3c1c2 (diff) | |
| parent | 60e233a56609fd963c59e99bd75c663d63fa91b6 (diff) | |
Merge tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg Kroah-Hartman:
"Here is one fix for 3.6-rc6 for the kobject.h file.
It fixes a reported oops if CONFIG_HOTPLUG is disabled. It's been in
the linux-next tree for a while now.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index fc615a97e2d3..1e57449395b1 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -224,7 +224,7 @@ static inline int kobject_uevent_env(struct kobject *kobj, static inline __printf(2, 3) int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) -{ return 0; } +{ return -ENOMEM; } static inline int kobject_action_type(const char *buf, size_t count, enum kobject_action *type) |