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/generic_ops.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/generic_ops.c')
| -rw-r--r-- | drivers/base/power/generic_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c index d03d290f31c..bfd898b8988 100644 --- a/drivers/base/power/generic_ops.c +++ b/drivers/base/power/generic_ops.c @@ -324,6 +324,6 @@ void pm_generic_complete(struct device *dev) * Let runtime PM try to suspend devices that haven't been in use before * going into the system-wide sleep state we're resuming from. */ - pm_runtime_idle(dev); + pm_request_idle(dev); } #endif /* CONFIG_PM_SLEEP */ |