[This is a fix on top of
hibernation-enter-platform-hibernation-state-in-a-consistent-way-rev-4.patch]
---
From: Rafael J. Wysocki <[EMAIL PROTECTED]>
If hibernation_platform_enter() fails, consoles should be resumed so that
diagnostic information related to the failure is available to the user.
Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
---
kernel/power/disk.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: linux-2.6.23-rc6/kernel/power/disk.c
===================================================================
--- linux-2.6.23-rc6.orig/kernel/power/disk.c
+++ linux-2.6.23-rc6/kernel/power/disk.c
@@ -293,7 +293,7 @@ int hibernation_platform_enter(void)
suspend_console();
error = device_suspend(PMSG_SUSPEND);
if (error)
- return error;
+ goto Resume_console;
error = hibernation_ops->prepare();
if (error)
@@ -320,6 +320,8 @@ int hibernation_platform_enter(void)
hibernation_ops->finish();
Resume_devices:
device_resume();
+ Resume_console:
+ resume_console();
return error;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
