The patch titled
Fix swsusp-change-code-order-in-diskc.patch
has been removed from the -mm tree. Its filename was
swsusp-change-code-order-in-diskc-fix.patch
This patch was dropped because it was folded into swsusp-change-code-ordering-in-diskc.patch
------------------------------------------------------
Subject: Fix swsusp-change-code-order-in-diskc.patch
From: Alexey Starikovskiy <alexey.y.starikovskiy@xxxxxxxxxxxxxxx>
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@xxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Nigel Cunningham <nigel@xxxxxxxxxxxx>
Cc: Patrick Mochel <mochel@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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@xxxxxxxxxxxxxxx are
origin.patch
swsusp-change-code-ordering-in-diskc.patch
swsusp-change-code-order-in-diskc-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
