diff --git a/[refs] b/[refs] index 7650e86d0089..c909ab86f7f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8de07bbdede03598801cf33ab23dcbcd28a918d2 +refs/heads/master: 1e6fcf840e11ceff8a656a678c6e4b0560a98e08 diff --git a/trunk/drivers/xen/manage.c b/trunk/drivers/xen/manage.c index 3ccd348d112d..b703dd2c9f11 100644 --- a/trunk/drivers/xen/manage.c +++ b/trunk/drivers/xen/manage.c @@ -68,15 +68,15 @@ static int xen_suspend(void *data) gnttab_resume(); xen_mm_unpin_all(); - sysdev_resume(); - device_power_up(PMSG_RESUME); - if (!*cancelled) { xen_irq_resume(); xen_console_resume(); xen_timer_resume(); } + sysdev_resume(); + device_power_up(PMSG_RESUME); + return 0; }