summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-07 16:12:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-07 16:12:29 -0800
commit1c70132ffbd3c93558c1c0b34ae228543391f355 (patch)
treea806ccfed6ef97f7aa310e86a80e41313be420f7 /drivers
parent22c6b32d8d9b7adf903c19b7e108062431fdc6fc (diff)
parentfe6b91f47080eb17d21cbf2a39311877d57f6938 (diff)
downloadlinux-1c70132ffbd3c93558c1c0b34ae228543391f355.tar.bz2
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index d8b3d89db043..919daa7cd5b1 100644
--- 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");