1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 10d03d7931c..7b69a1aef87 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -43,7 +43,6 @@ static int xen_suspend(void *data)
         if (err) {
                 printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
                         err);
-                dpm_resume_noirq(PMSG_RESUME);
                 return err;
         }
 
@@ -69,7 +68,6 @@ static int xen_suspend(void *data)
         }
 
         sysdev_resume();
-        dpm_resume_noirq(PMSG_RESUME);
 
         return 0;
 }
@@ -108,6 +106,9 @@ static void do_suspend(void)
         }
 
         err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
+
+        dpm_resume_noirq(PMSG_RESUME);
+
         if (err) {
                 printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
                 goto out;
@@ -119,8 +120,6 @@ static void do_suspend(void)
         } else
                 xs_suspend_cancel();
 
-        dpm_resume_noirq(PMSG_RESUME);
-
 resume_devices:
         dpm_resume_end(PMSG_RESUME);