From: Rafael J. Wysocki <rjw@xxxxxxx> Change the code ordering so that hibernation_ops->prepare() is called after device_suspend(). This is needed so that we don't violate the ACPI specification, which states that the _PTS and _GTS system-control methods, executed from acpi_sleep_prepare(), ought to be called after devices have been put in low power states. The "Finish" label in hibernation_restore() is moved, because device_suspend() resumes devices if the suspending of them fails and the restore code ordering should reflect the hibernation code ordering. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> --- kernel/power/disk.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Index: linux-2.6.22-rc1/kernel/power/disk.c =================================================================== --- linux-2.6.22-rc1.orig/kernel/power/disk.c 2007-05-18 23:49:33.000000000 +0200 +++ linux-2.6.22-rc1/kernel/power/disk.c 2007-05-18 23:56:47.000000000 +0200 @@ -133,15 +133,15 @@ int hibernation_snapshot(int platform_mo /* Free memory before shutting down devices. */ error = swsusp_shrink_memory(); if (error) - goto Finish; - - error = platform_prepare(platform_mode); - if (error) - goto Finish; + return error; suspend_console(); error = device_suspend(PMSG_FREEZE); if (error) + goto Resume_console; + + error = platform_prepare(platform_mode); + if (error) goto Resume_devices; error = disable_nonboot_cpus(); @@ -159,8 +159,8 @@ int hibernation_snapshot(int platform_mo Resume_devices: platform_finish(platform_mode); device_resume(); + Resume_console: resume_console(); - Finish: return error; } @@ -191,8 +191,8 @@ int hibernation_restore(int platform_mod enable_nonboot_cpus(); } platform_restore_cleanup(platform_mode); - Finish: device_resume(); + Finish: resume_console(); pm_restore_console(); return error; - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
