diff options
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r-- | drivers/base/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index abea76c36a4b..150a41580fad 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -1180,7 +1180,6 @@ void device_del(struct device *dev) | |||
1180 | if (dev->bus) | 1180 | if (dev->bus) |
1181 | blocking_notifier_call_chain(&dev->bus->p->bus_notifier, | 1181 | blocking_notifier_call_chain(&dev->bus->p->bus_notifier, |
1182 | BUS_NOTIFY_DEL_DEVICE, dev); | 1182 | BUS_NOTIFY_DEL_DEVICE, dev); |
1183 | device_pm_remove(dev); | ||
1184 | dpm_sysfs_remove(dev); | 1183 | dpm_sysfs_remove(dev); |
1185 | if (parent) | 1184 | if (parent) |
1186 | klist_del(&dev->p->knode_parent); | 1185 | klist_del(&dev->p->knode_parent); |
@@ -1205,6 +1204,7 @@ void device_del(struct device *dev) | |||
1205 | device_remove_file(dev, &uevent_attr); | 1204 | device_remove_file(dev, &uevent_attr); |
1206 | device_remove_attrs(dev); | 1205 | device_remove_attrs(dev); |
1207 | bus_remove_device(dev); | 1206 | bus_remove_device(dev); |
1207 | device_pm_remove(dev); | ||
1208 | driver_deferred_probe_del(dev); | 1208 | driver_deferred_probe_del(dev); |
1209 | 1209 | ||
1210 | /* Notify the platform of the removal, in case they | 1210 | /* Notify the platform of the removal, in case they |