1 files changed, 33 insertions, 22 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index c9632f841f64..f172f41858bb 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -287,17 +287,32 @@ void __attribute__ ((weak)) arch_suspend_enable_irqs(void)
  */
 static int suspend_enter(suspend_state_t state)
 {
-        int error = 0;
+        int error;
 
         device_pm_lock();
-        arch_suspend_disable_irqs();
-        BUG_ON(!irqs_disabled());
 
-        if ((error = device_power_down(PMSG_SUSPEND))) {
+        error = device_power_down(PMSG_SUSPEND);
+        if (error) {
                 printk(KERN_ERR "PM: Some devices failed to power down\n");
                 goto Done;
         }
 
+        if (suspend_ops->prepare) {
+                error = suspend_ops->prepare();
+                if (error)
+                        goto Power_up_devices;
+        }
+
+        if (suspend_test(TEST_PLATFORM))
+                goto Platfrom_finish;
+
+        error = disable_nonboot_cpus();
+        if (error || suspend_test(TEST_CPUS))
+                goto Enable_cpus;
+
+        arch_suspend_disable_irqs();
+        BUG_ON(!irqs_disabled());
+
         error = sysdev_suspend(PMSG_SUSPEND);
         if (!error) {
                 if (!suspend_test(TEST_CORE))
@@ -305,11 +320,22 @@ static int suspend_enter(suspend_state_t state)
                 sysdev_resume();
         }
 
-        device_power_up(PMSG_RESUME);
- Done:
         arch_suspend_enable_irqs();
         BUG_ON(irqs_disabled());
+
+ Enable_cpus:
+        enable_nonboot_cpus();
+
+ Platfrom_finish:
+        if (suspend_ops->finish)
+                suspend_ops->finish();
+
+ Power_up_devices:
+        device_power_up(PMSG_RESUME);
+
+ Done:
         device_pm_unlock();
+
         return error;
 }
 
@@ -341,23 +367,8 @@ int suspend_devices_and_enter(suspend_state_t state)
         if (suspend_test(TEST_DEVICES))
                 goto Recover_platform;
 
-        if (suspend_ops->prepare) {
-                error = suspend_ops->prepare();
-                if (error)
-                        goto Resume_devices;
-        }
-
-        if (suspend_test(TEST_PLATFORM))
-                goto Finish;
-
-        error = disable_nonboot_cpus();
-        if (!error && !suspend_test(TEST_CPUS))
-                suspend_enter(state);
+        suspend_enter(state);
 
-        enable_nonboot_cpus();
- Finish:
-        if (suspend_ops->finish)
-                suspend_ops->finish();
  Resume_devices:
         suspend_test_start();
         device_resume(PMSG_RESUME);