From kay.sievers@vrfy.org Thu May 19 14:01:44 2005 Date: Thu, 19 May 2005 22:50:32 +0200 From: Kay Sievers To: Greg KH Cc: David Zeuthen , linux-kernel@vger.kernel.org Subject: driver core: restore event order for device_add() Message-ID: <20050519205032.GA3301@vrfy.org> As a result of the split of the kobject-registration and the corresponding hotplug event, the order of events for device_add() has changed. This restores the old order, cause it confused some userspace applications. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- drivers/base/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/base/core.c 2005-05-23 14:59:20.000000000 -0700 +++ gregkh-2.6/drivers/base/core.c 2005-05-23 14:59:23.000000000 -0700 @@ -245,6 +245,7 @@ if ((error = kobject_add(&dev->kobj))) goto Error; + kobject_hotplug(&dev->kobj, KOBJ_ADD); if ((error = device_pm_add(dev))) goto PMError; if ((error = bus_add_device(dev))) @@ -257,14 +258,13 @@ /* notify platform of device entry */ if (platform_notify) platform_notify(dev); - - kobject_hotplug(&dev->kobj, KOBJ_ADD); Done: put_device(dev); return error; BusError: device_pm_remove(dev); PMError: + kobject_hotplug(&dev->kobj, KOBJ_REMOVE); kobject_del(&dev->kobj); Error: if (parent)