swsusp: fix hibernation code ordering

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@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index fa3b43b..77ac605 100644 (file)
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -133,15 +133,15 @@ int hibernation_snapshot(int platform_mode)
        /* 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_mode)
  Resume_devices:
        platform_finish(platform_mode);
        device_resume();
+ Resume_console:
        resume_console();
- Finish:
        return error;
 }
 
@@ -191,8 +191,8 @@ int hibernation_restore(int platform_mode)
                enable_nonboot_cpus();
        }
        platform_restore_cleanup(platform_mode);
- Finish:
        device_resume();
+ Finish:
        resume_console();
        pm_restore_console();
        return error;