Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

…git/rafael/linux-pm * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / Driver core: leave runtime PM enabled during system shutdown
git-mirror · Dec 8, 2011 · 1c70132 · 1c70132
2 parents 22c6b32 + fe6b91f
commit 1c70132
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/drivers/base/core.c b/drivers/base/core.c
@@ -1743,8 +1743,10 @@ void device_shutdown(void)
 		 */
 		list_del_init(&dev->kobj.entry);
 		spin_unlock(&devices_kset->list_lock);
-		/* Disable all device's runtime power management */
-		pm_runtime_disable(dev);
+
+		/* Don't allow any more runtime suspends */
+		pm_runtime_get_noresume(dev);
+		pm_runtime_barrier(dev);
 
 		if (dev->bus && dev->bus->shutdown) {
 			dev_dbg(dev, "shutdown\n");