+ swsusp-change-code-order-in-diskc-fix.patch added to -mm tree

+ swsusp-change-code-order-in-diskc-fix.patch added to -mm tree

[akpm]

The patch titled
     Fix swsusp-change-code-order-in-diskc.patch
has been added to the -mm tree.  Its filename is
     swsusp-change-code-order-in-diskc-fix.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: Fix swsusp-change-code-order-in-diskc.patch
From: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>

Recent patch from Rafael changed the order of platform_prepare() and
swsusp_read(). platform_prepare() should happen before swsusp_read()
in order to get nice LED blinking during load of the image and time for
GPE activity to settle down.

LED blinking and time for GPE activity to stop.

Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Greg KH <greg@kroah.com>
Cc: Nigel Cunningham <nigel@suspend2.net>
Cc: Patrick Mochel <mochel@digitalimplant.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/power/disk.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff -puN kernel/power/disk.c~swsusp-change-code-order-in-diskc-fix kernel/power/disk.c
--- a/kernel/power/disk.c~swsusp-change-code-order-in-diskc-fix
+++ a/kernel/power/disk.c
@@ -240,21 +240,22 @@ static int software_resume(void)
 		goto Done;
 	}
 
-	pr_debug("PM: Reading swsusp image.\n");
-
-	error = swsusp_read();
+	error = platform_prepare();
 	if (error) {
 		swsusp_free();
 		goto Thaw;
 	}
 
-	pr_debug("PM: Preparing devices for restore.\n");
+	pr_debug("PM: Reading swsusp image.\n");
 
-	error = platform_prepare();
+	error = swsusp_read();
 	if (error) {
 		swsusp_free();
 		goto Thaw;
 	}
+
+	pr_debug("PM: Preparing devices for restore.\n");
+
 	suspend_console();
 	error = device_suspend(PMSG_PRETHAW);
 	if (error)
_

Patches currently in -mm which might be from alexey.y.starikovskiy@linux.intel.com are

swsusp-change-code-order-in-diskc-fix.patch