Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

1 files changed, 13 insertions, 15 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 84272ed77f03..12e311dc664c 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -42,10 +42,6 @@ static char *action_to_string(enum kobject_action action)
                 return "remove";
         case KOBJ_CHANGE:
                 return "change";
-        case KOBJ_MOUNT:
-                return "mount";
-        case KOBJ_UMOUNT:
-                return "umount";
         case KOBJ_OFFLINE:
                 return "offline";
         case KOBJ_ONLINE:
@@ -95,10 +91,8 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 
         /* search the kset we belong to */
         top_kobj = kobj;
-        if (!top_kobj->kset && top_kobj->parent) {
-                do {
-                        top_kobj = top_kobj->parent;
-                } while (!top_kobj->kset && top_kobj->parent);
+        while (!top_kobj->kset && top_kobj->parent) {
+                top_kobj = top_kobj->parent;
         }
         if (!top_kobj->kset) {
                 pr_debug("kobject attempted to send uevent without kset!\n");
@@ -115,6 +109,16 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                         return 0;
                 }
 
+        /* originating subsystem */
+        if (uevent_ops && uevent_ops->name)
+                subsystem = uevent_ops->name(kset, kobj);
+        else
+                subsystem = kobject_name(&kset->kobj);
+        if (!subsystem) {
+                pr_debug("unset subsytem caused the event to drop!\n");
+                return 0;
+        }
+
         /* environment index */
         envp = kzalloc(NUM_ENVP * sizeof (char *), GFP_KERNEL);
         if (!envp)
@@ -134,12 +138,6 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
                 goto exit;
         }
 
-        /* originating subsystem */
-        if (uevent_ops && uevent_ops->name)
-                subsystem = uevent_ops->name(kset, kobj);
-        else
-                subsystem = kobject_name(&kset->kobj);
-
         /* event environemnt for helper process only */
         envp[i++] = "HOME=/";
         envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
@@ -293,7 +291,7 @@ EXPORT_SYMBOL_GPL(add_uevent_var);
 static int __init kobject_uevent_init(void)
 {
         uevent_sock = netlink_kernel_create(NETLINK_KOBJECT_UEVENT, 1, NULL,
-                                            THIS_MODULE);
+                                            NULL, THIS_MODULE);
 
         if (!uevent_sock) {
                 printk(KERN_ERR