summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-03-16 13:38:06 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-16 19:25:03 -0700
commit886c5952950ffed0e8ca3eb9efdc2728bfc144d3 (patch)
tree631e6695dbb1c4eca62ffc873fd435dc8f31f68b
parent765e3d8a71bbc1f3400667d5cfcfd7b03382d587 (diff)
downloadop-kernel-dev-886c5952950ffed0e8ca3eb9efdc2728bfc144d3.zip
op-kernel-dev-886c5952950ffed0e8ca3eb9efdc2728bfc144d3.tar.gz
[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>
-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 406b20a..a200c5f 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -251,6 +251,7 @@ static int software_resume(void)
error = swsusp_read();
if (error) {
swsusp_free();
+ platform_finish();
goto Thaw;
}
OpenPOWER on IntegriCloud