diff options
| author | Pavel Machek <pavel@ucw.cz> | 2007-03-22 09:11:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-23 03:39:06 +0100 |
| commit | 058560fbd70190ea6b50b5df4d814bc30911d06b (patch) | |
| tree | 66aa04a78e34e91ab989a81a8bfa901cb6c47181 /kernel/power/disk.c | |
| parent | [PATCH] NOMMU: make SYSV SHM nattch work correctly (diff) | |
| download | linux-058560fbd70190ea6b50b5df4d814bc30911d06b.tar.xz linux-058560fbd70190ea6b50b5df4d814bc30911d06b.zip | |
[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>
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | 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 873cdf8ea5a4..dee0ff40befd 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: |