From a6f4ca5022e0572bed5f8718aeb1d8ba4d8ce150 Mon Sep 17 00:00:00 2001 From: LongX Zhang Date: Thu, 25 Oct 2012 00:21:28 +0200 Subject: [PATCH] --- yaml --- r: 336748 b: refs/heads/master c: 4b6d1f12f9c4e0e420d5747d3ae285d8f66d627f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4985e3a50941..f9baec6b2d7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8316bd72c0248adbb9572abf2dd045a95f682bcd +refs/heads/master: 4b6d1f12f9c4e0e420d5747d3ae285d8f66d627f diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c index abea76c36a4b..150a41580fad 100644 --- a/trunk/drivers/base/core.c +++ b/trunk/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