aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2008-06-12 17:24:06 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-06-12 17:25:09 -0400
commitd8f3de0d2412bb91639cfefc5b3c79dbf3812212 (patch)
tree05d0530d06e898b7eeac5c781ee9f00972a7f67a /drivers/base
parent53eb2fbeb9e68e1a9a23945de8450999c46270ce (diff)
Suspend-related patches for 2.6.27
ACPI PM: Add possibility to change suspend sequence There are some systems out there that don't work correctly with our current suspend/hibernation code ordering. Provide a workaround for these systems allowing them to pass 'acpi_sleep=old_ordering' in the kernel command line so that it will use the pre-ACPI 2.0 ("old") suspend code ordering. Unfortunately, this requires us to add a platform hook to the resuming of devices for recovering the platform in case one of the device drivers' .suspend() routines returns error code. Namely, ACPI 1.0 specifies that _PTS should be called before suspending devices, but _WAK still should be called before resuming them in order to undo the changes made by _PTS. However, if there is an error during suspending devices, they are automatically resumed without returning control to the PM core, so the _WAK has to be called from within device_resume() in that cases. The patch also reorders and refactors the ACPI suspend/hibernation code to avoid duplication as far as reasonably possible. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index d571204aaff7..3250c5257b74 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -781,8 +781,6 @@ int device_suspend(pm_message_t state)
781 error = dpm_prepare(state); 781 error = dpm_prepare(state);
782 if (!error) 782 if (!error)
783 error = dpm_suspend(state); 783 error = dpm_suspend(state);
784 if (error)
785 device_resume(resume_event(state));
786 return error; 784 return error;
787} 785}
788EXPORT_SYMBOL_GPL(device_suspend); 786EXPORT_SYMBOL_GPL(device_suspend);