]> err.no Git - linux-2.6/commitdiff
driver core: Remove dpm_sysfs_remove() from error path of device_add()
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 3 Mar 2008 22:46:51 +0000 (23:46 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 4 Mar 2008 22:47:05 +0000 (14:47 -0800)
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>
drivers/base/core.c

index 1e2e0fa8a450086f924d79d28ecd07649deaf6ab..7f59c2f2ebcba6fd8236f32235a9e1c9df00c35b 100644 (file)
@@ -839,7 +839,6 @@ int device_add(struct device *dev)
        return error;
  BusError:
        device_pm_remove(dev);
-       dpm_sysfs_remove(dev);
  PMError:
        if (dev->bus)
                blocking_notifier_call_chain(&dev->bus->p->bus_notifier,