The patch titled
swsusp: Fix resume error path in platform mode
has been added to the -mm tree. Its filename is
swsusp-fix-resume-error-path-in-platform-mode.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: swsusp: Fix resume error path in platform mode
From: Rafael J. Wysocki <rjw@xxxxxxx>
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@xxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/power/disk.c | 1 +
1 file changed, 1 insertion(+)
diff -puN kernel/power/disk.c~swsusp-fix-resume-error-path-in-platform-mode kernel/power/disk.c
--- a/kernel/power/disk.c~swsusp-fix-resume-error-path-in-platform-mode
+++ a/kernel/power/disk.c
@@ -251,6 +251,7 @@ static int software_resume(void)
error = swsusp_read();
if (error) {
swsusp_free();
+ platform_finish();
goto Thaw;
}
_
Patches currently in -mm which might be from rjw@xxxxxxx are
swsusp-fix-resume-error-path-in-platform-mode.patch
swsusp-disable-nonboot-cpus-before-entering-platform-suspend.patch
make-xfs-workqueues-nonfreezable.patch
fix-refrigerator-vs-thaw_process-race.patch
freezer-task-exit_state-should-be-treated-as-bolean.patch
documentation-ask-driver-writers-to-provide-pm-support.patch
freezer-read-pf_borrowed_mm-in-a-nonracy-way.patch
freezer-close-theoretical-race-between-refrigerator-and-thaw_tasks.patch
freezer-remove-pf_nofreeze-from-rcutorture-thread.patch
freezer-remove-pf_nofreeze-from-bluetooth-threads.patch
freezer-add-try_to_freeze-calls-to-all-kernel-threads.patch
freezer-fix-vfork-problem.patch
freezer-take-kernel_execve-into-consideration.patch
shrink_slab-handle-bad-shrinkers.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
