Commit 058560fb authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[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: default avatarPavel Machek <pavel@suse.cz>
Acked-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 165b2392
...@@ -241,18 +241,11 @@ static int software_resume(void) ...@@ -241,18 +241,11 @@ static int software_resume(void)
goto Done; goto Done;
} }
error = platform_prepare();
if (error) {
swsusp_free();
goto Thaw;
}
pr_debug("PM: Reading swsusp image.\n"); pr_debug("PM: Reading swsusp image.\n");
error = swsusp_read(); error = swsusp_read();
if (error) { if (error) {
swsusp_free(); swsusp_free();
platform_finish();
goto Thaw; goto Thaw;
} }
...@@ -270,7 +263,6 @@ static int software_resume(void) ...@@ -270,7 +263,6 @@ static int software_resume(void)
enable_nonboot_cpus(); enable_nonboot_cpus();
Free: Free:
swsusp_free(); swsusp_free();
platform_finish();
device_resume(); device_resume();
resume_console(); resume_console();
Thaw: Thaw:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment