lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Browse Source 
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()"
This commit is contained in:
Linus Torvalds
2012-09-14 14:53:22 -07:00
parent 55815f7014 60e233a566
commit 0462bfc88d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/kobject.h
View File

@@ -224,7 +224,7 @@ static inline int kobject_uevent_env(struct kobject *kobj,
static inline __printf(2, 3) static inline __printf(2, 3)
int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) 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, static inline int kobject_action_type(const char *buf, size_t count,
enum kobject_action *type) enum kobject_action *type)