diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-03-11 23:59:38 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-20 02:10:24 (GMT) |
commit | 57eee3d23e8833ca18708b374c648235691942ba (patch) | |
tree | 59dc775f05ba7896663e0ab2262f4739f95d22f5 /drivers/base/core.c | |
parent | 58aca23226a19983571bd3b65167521fc64f5869 (diff) | |
download | linux-57eee3d23e8833ca18708b374c648235691942ba.tar.xz |
Driver core: Call device_pm_add() after bus_add_device() in device_add()
Include dpm_sysfs_add() into device_pm_add(), in analogy with
device_pm_remove(), and modify device_add() to call the latter after
bus_add_device(), to avoid situations in which the PM core may
attempt to suspend a device the registration of which has not been
successful.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r-- | drivers/base/core.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 79848e6..adbc017 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -817,17 +817,12 @@ int device_add(struct device *dev) error = device_add_attrs(dev); if (error) goto AttrsError; - error = dpm_sysfs_add(dev); - if (error) - goto PMError; - error = device_pm_add(dev); - if (error) { - dpm_sysfs_remove(dev); - goto PMError; - } error = bus_add_device(dev); if (error) goto BusError; + error = device_pm_add(dev); + if (error) + goto PMError; kobject_uevent(&dev->kobj, KOBJ_ADD); bus_attach_device(dev); if (parent) @@ -847,9 +842,9 @@ int device_add(struct device *dev) Done: put_device(dev); return error; - BusError: - device_pm_remove(dev); PMError: + bus_remove_device(dev); + BusError: if (dev->bus) blocking_notifier_call_chain(&dev->bus->p->bus_notifier, BUS_NOTIFY_DEL_DEVICE, dev); |