fix extra BIOS invocation during resume
Subsystems (2)
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]>
kernel/power/disk.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
kernel/power/disk.c +0 -8
@@ -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:
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html