diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:54:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:54:22 +0200 |
| commit | 0acaab5367a2c4140bd965a0ad3ea265af4d43ed (patch) | |
| tree | 944fc8279a28c94e136325ec337ebe216a129ec1 /drivers/base/power/domain.c | |
| parent | c940c8ce1db3ed3909d31c02aef01a864565519c (diff) | |
| parent | 841670351e8e5acbe9f7367f7df661a5d0cfef79 (diff) | |
Merge branch 'pm-runtime'
* pm-runtime:
PM / Runtime: Improve prepare handling at system suspend for genpd
PM / Runtime: Asyncronous idle|suspend parent devices at removal
PM / Runtime: Asyncronous idle|suspend devices at system resume
Diffstat (limited to 'drivers/base/power/domain.c')
| -rw-r--r-- | drivers/base/power/domain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 9a6b05a3560..7072404c8b6 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -920,7 +920,7 @@ static int pm_genpd_prepare(struct device *dev) pm_wakeup_event(dev, 0); if (pm_wakeup_pending()) { - pm_runtime_put_sync(dev); + pm_runtime_put(dev); return -EBUSY; } @@ -961,7 +961,7 @@ static int pm_genpd_prepare(struct device *dev) pm_runtime_enable(dev); } - pm_runtime_put_sync(dev); + pm_runtime_put(dev); return ret; } @@ -1327,7 +1327,7 @@ static void pm_genpd_complete(struct device *dev) pm_generic_complete(dev); pm_runtime_set_active(dev); pm_runtime_enable(dev); - pm_runtime_idle(dev); + pm_request_idle(dev); } } |