Commit:     886c5952950ffed0e8ca3eb9efdc2728bfc144d3
Parent:     765e3d8a71bbc1f3400667d5cfcfd7b03382d587
Author:     Rafael J. Wysocki <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 16 13:38:06 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Mar 16 19:25:03 2007 -0700

    [PATCH] swsusp: Fix resume error path in platform mode
    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 <[EMAIL PROTECTED]>
    Acked-by: Pavel Machek <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 kernel/power/disk.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 406b20a..a200c5f 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -251,6 +251,7 @@ static int software_resume(void)
        error = swsusp_read();
        if (error) {
+               platform_finish();
                goto Thaw;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to