Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2 files changed, 3 insertions, 10 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index f2b3b0ea512a..0b43847dc980 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -53,7 +53,7 @@ static void power_down(suspend_disk_method_t mode)
 
         switch(mode) {
         case PM_DISK_PLATFORM:
-                kernel_power_off_prepare();
+                kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
                 error = pm_ops->enter(PM_SUSPEND_DISK);
                 break;
         case PM_DISK_SHUTDOWN:
@@ -95,13 +95,6 @@ static int prepare_processes(void)
                 goto thaw;
         }
 
-        if (pm_disk_mode == PM_DISK_PLATFORM) {
-                if (pm_ops && pm_ops->prepare) {
-                        if ((error = pm_ops->prepare(PM_SUSPEND_DISK)))
-                                goto thaw;
-                }
-        }
-
         /* Free memory before shutting down devices. */
         if (!(error = swsusp_shrink_memory()))
                 return 0;
diff --git a/kernel/power/main.c b/kernel/power/main.c
index d253f3ae2fa5..9cb235cba4a9 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -133,10 +133,10 @@ static int suspend_enter(suspend_state_t state)
 static void suspend_finish(suspend_state_t state)
 {
         device_resume();
-        if (pm_ops && pm_ops->finish)
-                pm_ops->finish(state);
         thaw_processes();
         enable_nonboot_cpus();
+        if (pm_ops && pm_ops->finish)
+                pm_ops->finish(state);
         pm_restore_console();
 }