summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-07-12 00:39:10 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-07-12 00:39:10 +0200
commit6f00ff78278fd5d6ac110b6903ee042af2d6af91 (patch)
treee466b608591a916ed3a6faace59a47065a2a6f4f /drivers/base
parent775b8ae8707592af9275b8b216c2bf056b3f5d82 (diff)
downloadlinux-3.10-6f00ff78278fd5d6ac110b6903ee042af2d6af91.tar.gz
linux-3.10-6f00ff78278fd5d6ac110b6903ee042af2d6af91.tar.bz2
linux-3.10-6f00ff78278fd5d6ac110b6903ee042af2d6af91.zip
PM / Domains: Set device state to "active" during system resume
The runtime PM status of devices in a power domain that is not powered off in pm_genpd_complete() should be set to "active", because those devices are operational at this point. Some of them may not be in use, though, so make pm_genpd_complete() call pm_runtime_idle() in addition to pm_runtime_set_active() for each of them. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/domain.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 1f1a7d85f29..0e7e91baec1 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -786,7 +786,9 @@ static void pm_genpd_complete(struct device *dev)
if (run_complete) {
pm_generic_complete(dev);
+ pm_runtime_set_active(dev);
pm_runtime_enable(dev);
+ pm_runtime_idle(dev);
}
}