diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 08:31:34 +0100 |
commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /Documentation/power/runtime_pm.txt | |
parent | ALSA: hdsp - Remove obsolete settings functions (diff) | |
parent | ALSA: hda - Add Conexant CX20755/20756/20757 codec IDs (diff) | |
download | linux-dev-e152f18027552eb34006b35347e72bc805783027.tar.xz linux-dev-e152f18027552eb34006b35347e72bc805783027.zip |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
Diffstat (limited to 'Documentation/power/runtime_pm.txt')
-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 |