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

Hi,

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.

Attaching the patch to fix order.
Regards,
Alex.

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.

From: Alexey Starikovskiy <[email protected]>

LED blinking and time for GPE activity to stop.
---

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

index 33e67b4..406b20a 100644
@@ -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)

Hi!

Well, looks acceptable to me.

But if GPEs need some time to settle down, that should be done explicitely, and with _big_ comment? What if your disk is too fast?

Also, same problem is likely present in uswsusp (and harder to fix there). Is this really required?
Pavel

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

ACPI interrupt gets disabled if the GPE activity is not disabled before switching to loaded image
on some Acer machines. In most cases disabling them just before sw_switch() is enough, but it's better to
be on a safe side. And don't forget about blinking LED :)

Regards,
Alex.