Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=058560fbd70190ea6b50b5df4d814bc30911d06b
Commit:     058560fbd70190ea6b50b5df4d814bc30911d06b
Parent:     165b239270be610a1e3999cb0d2e4e2c1f2a8fd4
Author:     Pavel Machek <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 22 00:11:25 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Mar 22 19:39:06 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Acked-by: "Rafael J. Wysocki" <[EMAIL PROTECTED]>
    Cc: Adrian Bunk <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 kernel/power/disk.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 873cdf8..dee0ff4 100644
--- 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:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to