From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Fri, 16 Mar 2007 21:38:06 +0000 (-0800)
Subject: [PATCH] swsusp: Fix resume error path in platform mode
X-Git-Tag: v2.6.21-rc5~108
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=886c5952950ffed0e8ca3eb9efdc2728bfc144d3;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 406b20adb27..a200c5fc42e 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;
 	}