---

yaml --- r: 336748 b: refs/heads/master c: 4b6d1f1 h: refs/heads/master v: v3
git-mirror · Nov 14, 2012 · a6f4ca5 · a6f4ca5
1 parent 0f72edc
commit a6f4ca5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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