Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 0 insertions, 7 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 406b20adb27a..aec19b063e3f 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -240,12 +240,6 @@ static int software_resume(void)
                 goto Done;
         }
 
-        error = platform_prepare();
-        if (error) {
-                swsusp_free();
-                goto Thaw;
-        }
-
         pr_debug("PM: Reading swsusp image.\n");
 
         error = swsusp_read();
@@ -268,7 +262,6 @@ static int software_resume(void)
         enable_nonboot_cpus();
  Free:
         swsusp_free();
-        platform_finish();
         device_resume();
         resume_console();
  Thaw: