diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-06 00:36:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-06 00:36:17 +0100 |
| commit | f67ffa95836b31be5d8fe336aee3bfc6412c5696 (patch) | |
| tree | 444417975bd55480818ad40a723591465091c6dc /Documentation | |
| parent | 868b093505d6378df77bc2bb656af082330127a8 (diff) | |
| parent | 9f6d8f6ab26b42620a914d67f29822f9bba90233 (diff) | |
Merge branch 'pm-sleep'
* pm-sleep:
PM: Move disabling/enabling runtime PM to late suspend/early resume
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/power/runtime_pm.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt index 4abe83e1045a..03591a750f99 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt @@ -642,12 +642,13 @@ out the following operations: * During system suspend it calls pm_runtime_get_noresume() and pm_runtime_barrier() for every device right before executing the subsystem-level .suspend() callback for it. In addition to that it calls - pm_runtime_disable() for every device right after executing the - subsystem-level .suspend() callback for it. + __pm_runtime_disable() with 'false' as the second argument for every device + right before executing the subsystem-level .suspend_late() callback for it. * During system resume it calls pm_runtime_enable() and pm_runtime_put_sync() - for every device right before and right after executing the subsystem-level - .resume() callback for it, respectively. + for every device right after executing the subsystem-level .resume_early() + callback and right after executing the subsystem-level .resume() callback + for it, respectively. 7. Generic subsystem callbacks |