Messages in this thread Patch in this message | | | Date | Thu, 22 Mar 2007 00:58:38 +0100 | From | Pavel Machek <> | Subject | 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>
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:
-- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |