[PATCH] Fix swsusp-change-code-order-in-diskc.patch

Alexey Starikovskiy
2007-01-25T12:36:38Z

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

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.

[-- Attachment #2: fix-swsusp-change-code-ordering-in-diskc.patch --]
[-- Type: text/plain, Size: 1150 bytes --]

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 <alexey.y.starikovskiy@linux.intel.com>

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

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

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 33e67b4..406b20a 100644
--- a/kernel/power/disk.c
+++ b/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)

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]