diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-03-03 17:46:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-03-04 17:47:05 -0500 |
commit | 135dee0cd0eb2638fab899b428e51f00e8c046a8 (patch) | |
tree | f45d0021383e4fd52cfbc4c2ac879c62fea7724f /drivers/base | |
parent | 1b3cbec1dcb6747b587b40335f5de1d9e035063c (diff) |
driver core: Remove dpm_sysfs_remove() from error path of device_add()
Since device_pm_remove(dev) calls dpm_sysfs_remove(dev), it's
incorrect to call the latter after the former in the device_add()
error path.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 1e2e0fa8a450..7f59c2f2ebcb 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -839,7 +839,6 @@ int device_add(struct device *dev) | |||
839 | return error; | 839 | return error; |
840 | BusError: | 840 | BusError: |
841 | device_pm_remove(dev); | 841 | device_pm_remove(dev); |
842 | dpm_sysfs_remove(dev); | ||
843 | PMError: | 842 | PMError: |
844 | if (dev->bus) | 843 | if (dev->bus) |
845 | blocking_notifier_call_chain(&dev->bus->p->bus_notifier, | 844 | blocking_notifier_call_chain(&dev->bus->p->bus_notifier, |