diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-01-08 00:04:17 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-01 18:30:56 -0500 |
| commit | c697eecebc6cfc0b393afea3c4ff1a5041526ad1 (patch) | |
| tree | 36b0cb4e667792212c2b5d05ac212662555d1682 /kernel | |
| parent | 7671b8ae5381a504d4c4ef8dd9c47128c2c3fd7e (diff) | |
| download | linux-c697eecebc6cfc0b393afea3c4ff1a5041526ad1.tar.gz | |
Suspend: Introduce begin() and end() callbacks
On ACPI systems the target state set by acpi_pm_set_target() is reset by acpi_pm_finish(), but that need not be called if the suspend fails. All platforms that use the .set_target() global suspend callback are affected by analogous issues. For this reason, we need an additional global suspend callback that will reset the target state regardless of whether or not the suspend is successful. Also, it is reasonable to rename the .set_target() callback, since it will be used for a different purpose on ACPI systems (due to ACPI 1.0x code ordering requirements). Introduce the global suspend callback .end() to be executed at the end of the suspend sequence and rename the .set_target() global suspend callback to .begin(). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 050a6077ea45..d9bba452764b 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -258,10 +258,10 @@ int suspend_devices_and_enter(suspend_state_t state) if (!suspend_ops) return -ENOSYS; - if (suspend_ops->set_target) { - error = suspend_ops->set_target(state); + if (suspend_ops->begin) { + error = suspend_ops->begin(state); if (error) - return error; + goto Close; } suspend_console(); error = device_suspend(PMSG_SUSPEND); @@ -294,6 +294,9 @@ int suspend_devices_and_enter(suspend_state_t state) device_resume(); Resume_console: resume_console(); + Close: + if (suspend_ops->end) + suspend_ops->end(); return error; } |