[PATCH] fix extra BIOS invocation during resume

It causes extra moon icons blinking on x60, and breaks at least two other
systems.

During resume, we do not know that "reboot"/"shutdown" method was used, so
we assume "plaform" and call BIOS, anyway...

This is 2.6.21 material, and should fix 2 or 3 regressions from 2.6.20.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Adrian Bunk <bunk@stusta.de>
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 873cdf8..dee0ff4 100644 (file)
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -241,18 +241,11 @@ 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();
        if (error) {
                swsusp_free();
-               platform_finish();
                goto Thaw;
        }
 
@@ -270,7 +263,6 @@ static int software_resume(void)
        enable_nonboot_cpus();
  Free:
        swsusp_free();
-       platform_finish();
        device_resume();
        resume_console();
  Thaw: