diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-29 20:46:48 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-29 20:46:48 (GMT) |
| commit | 170bb4c800d2b65df52f37400fb20276273650d8 (patch) | |
| tree | 86ff97efaeeac6e8533feb4899ec674ddbc0a065 /drivers/base | |
| parent | 64adb0192ff309051492b34139bb842024ebb119 (diff) | |
| parent | e5f5762177be52fde50ccba88938d66b5103c8e0 (diff) | |
| download | linux-fsl-qoriq-170bb4c800d2b65df52f37400fb20276273650d8.tar.xz | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Freezer: Fixup compile error of try_to_freeze_nowarn()
driver core / PM: move the calling to device_pm_remove behind the calling to bus_remove_device
PM / Hibernate: use rb_entry
PM / sysfs: replace strict_str* with kstrto*
Diffstat (limited to 'drivers/base')
| -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 abea76c..150a415 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1180,7 +1180,6 @@ void device_del(struct device *dev) if (dev->bus) blocking_notifier_call_chain(&dev->bus->p->bus_notifier, BUS_NOTIFY_DEL_DEVICE, dev); - device_pm_remove(dev); dpm_sysfs_remove(dev); if (parent) klist_del(&dev->p->knode_parent); @@ -1205,6 +1204,7 @@ void device_del(struct device *dev) device_remove_file(dev, &uevent_attr); device_remove_attrs(dev); bus_remove_device(dev); + device_pm_remove(dev); driver_deferred_probe_del(dev); /* Notify the platform of the removal, in case they |