[ACPI] fix reboot upon suspend-to-disk

http://bugzilla.kernel.org/show_bug.cgi?id=4320

Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 027322a564..f2cd279d07 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -52,7 +52,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:
@@ -119,13 +119,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. */
         free_some_memory();
         return 0;