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

Commit 187a1a94 authored by Kay Sievers's avatar Kay Sievers Committed by Linus Torvalds
Browse files

[PATCH] driver core: restore event order for device_add() 



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: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ab3fc403

drivers/base/core.c

+2 −2
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ int device_add(struct device *dev) 


	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 @@ int device_add(struct device *dev) 
	/* 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)