1 files changed, 8 insertions, 7 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 40d56a31245e..b98b80ccf437 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -97,25 +97,26 @@ static int suspend_prepare(suspend_state_t state)
                 }
         }
 
-        if (pm_ops->prepare) {
-                if ((error = pm_ops->prepare(state)))
-                        goto Thaw;
-        }
-
         suspend_console();
         error = device_suspend(PMSG_SUSPEND);
         if (error) {
                 printk(KERN_ERR "Some devices failed to suspend\n");
-                goto Resume_devices;
+                goto Resume_console;
         }
+        if (pm_ops->prepare) {
+                if ((error = pm_ops->prepare(state)))
+                        goto Resume_devices;
+        }
+
         error = disable_nonboot_cpus();
         if (!error)
                 return 0;
 
         enable_nonboot_cpus();
- Resume_devices:
         pm_finish(state);
+ Resume_devices:
         device_resume();
+ Resume_console:
         resume_console();
  Thaw:
         thaw_processes();