1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/kexec.c b/kernel/kexec.c
index c7fd6692939d..dade9af6bf21 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1454,7 +1454,6 @@ int kernel_kexec(void)
                 if (error)
                         goto Resume_devices;
                 device_pm_lock();
-                local_irq_disable();
                 /* At this point, device_suspend() has been called,
                  * but *not* device_power_down(). We *must*
                  * device_power_down() now.  Otherwise, drivers for
@@ -1464,8 +1463,9 @@ int kernel_kexec(void)
                  */
                 error = device_power_down(PMSG_FREEZE);
                 if (error)
-                        goto Enable_irqs;
+                        goto Unlock_pm;
 
+                local_irq_disable();
                 /* Suspend system devices */
                 error = sysdev_suspend(PMSG_FREEZE);
                 if (error)
@@ -1484,9 +1484,9 @@ int kernel_kexec(void)
         if (kexec_image->preserve_context) {
                 sysdev_resume();
  Power_up_devices:
-                device_power_up(PMSG_RESTORE);
- Enable_irqs:
                 local_irq_enable();
+                device_power_up(PMSG_RESTORE);
+ Unlock_pm:
                 device_pm_unlock();
                 enable_nonboot_cpus();
  Resume_devices: