aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/disk.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-03-16 17:38:06 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-16 22:25:03 -0400
commit886c5952950ffed0e8ca3eb9efdc2728bfc144d3 (patch)
tree631e6695dbb1c4eca62ffc873fd435dc8f31f68b /kernel/power/disk.c
parent765e3d8a71bbc1f3400667d5cfcfd7b03382d587 (diff)
[PATCH] swsusp: Fix resume error path in platform mode
If swsusp is using the platform mode during the resume and the image cannot be read, the platform mode should be switched off before software_resume() returns. Make it happen. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Pavel Machek <pavel@ucw.cz> 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 406b20adb27a..a200c5fc42ee 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -251,6 +251,7 @@ static int software_resume(void)
251 error = swsusp_read(); 251 error = swsusp_read();
252 if (error) { 252 if (error) {
253 swsusp_free(); 253 swsusp_free();
254 platform_finish();
254 goto Thaw; 255 goto Thaw;
255 } 256 }
256 257