From f1eba35f8cb4cb4d1bfdf1e6c9eda7e0d1bba6d6 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 19 Jul 2007 01:47:31 -0700 Subject: [PATCH] --- yaml --- r: 61542 b: refs/heads/master c: 10a1803d667e209914eaada9b95525252f23ec78 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/power/disk.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b75c9c502e39..f19a05c6f3f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a634cc10164d1c229fbeca33923e6a0ed939e894 +refs/heads/master: 10a1803d667e209914eaada9b95525252f23ec78 diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c index fa3b43b7206d..77ac605bf20a 100644 --- a/trunk/kernel/power/disk.c +++ b/trunk/kernel/power/disk.c @@ -133,14 +133,14 @@ int hibernation_snapshot(int platform_mode) /* Free memory before shutting down devices. */ error = swsusp_shrink_memory(); if (error) - goto Finish; - - error = platform_prepare(platform_mode); - if (error) - goto Finish; + return error; suspend_console(); error = device_suspend(PMSG_FREEZE); + if (error) + goto Resume_console; + + error = platform_prepare(platform_mode); if (error) goto Resume_devices; @@ -159,8 +159,8 @@ int hibernation_snapshot(int platform_mode) Resume_devices: platform_finish(platform_mode); device_resume(); + Resume_console: resume_console(); - Finish: return error; } @@ -191,8 +191,8 @@ int hibernation_restore(int platform_mode) enable_nonboot_cpus(); } platform_restore_cleanup(platform_mode); - Finish: device_resume(); + Finish: resume_console(); pm_restore_console(); return error;