diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-07 19:12:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-07 19:12:29 -0500 |
| commit | 1c70132ffbd3c93558c1c0b34ae228543391f355 (patch) | |
| tree | a806ccfed6ef97f7aa310e86a80e41313be420f7 /drivers | |
| parent | 22c6b32d8d9b7adf903c19b7e108062431fdc6fc (diff) | |
| parent | fe6b91f47080eb17d21cbf2a39311877d57f6938 (diff) | |
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.c | 6 |
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) | |||
| 1743 | */ | 1743 | */ |
| 1744 | list_del_init(&dev->kobj.entry); | 1744 | list_del_init(&dev->kobj.entry); |
| 1745 | spin_unlock(&devices_kset->list_lock); | 1745 | spin_unlock(&devices_kset->list_lock); |
| 1746 | /* Disable all device's runtime power management */ | 1746 | |
| 1747 | pm_runtime_disable(dev); | 1747 | /* Don't allow any more runtime suspends */ |
| 1748 | pm_runtime_get_noresume(dev); | ||
| 1749 | pm_runtime_barrier(dev); | ||
| 1748 | 1750 | ||
| 1749 | if (dev->bus && dev->bus->shutdown) { | 1751 | if (dev->bus && dev->bus->shutdown) { |
| 1750 | dev_dbg(dev, "shutdown\n"); | 1752 | dev_dbg(dev, "shutdown\n"); |