[PATCH] Driver core: send hotplug event before adding class interfaces

Move call to kobject_hotplug() above code that adds interfaces
to a class device, otherwise children's hotplug events may reach
userspace first.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/class.c b/drivers/base/class.c
index ce23dc8c18c590fe11b4eeff4ae6d933fb894731..8df58c57dd25a04787032400a98a158946925005 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -524,6 +524,8 @@ int class_device_add(struct class_device *class_dev)
                                  class_name);
        }
 
+       kobject_hotplug(&class_dev->kobj, KOBJ_ADD);
+
        /* notify any interfaces this device is now here */
        if (parent) {
                down(&parent->sem);
@@ -533,7 +535,6 @@ int class_device_add(struct class_device *class_dev)
                                class_intf->add(class_dev);
                up(&parent->sem);
        }
-       kobject_hotplug(&class_dev->kobj, KOBJ_ADD);
 
  register_done:
        if (error && parent)