Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0462bfc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* 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()"
parents 55815f70 60e233a5

include/linux/kobject.h

+1 −1
Original line number Diff line number Diff line
@@ -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)