From de2d9a5d9eea30d1911e281952e230be7bf728e4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 25 Mar 2009 17:46:42 +0000 Subject: [PATCH] --- yaml --- r: 143245 b: refs/heads/master c: 9a5a2cac9f99c98d9d15cec17b1904f29d0e8009 h: refs/heads/master i: 143243: 29fd308f00c51394278406aec9cf778c90955294 v: v3 --- [refs] | 2 +- trunk/drivers/xen/manage.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b8db147364c8..f9e3386278ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3f8a74e3a884b91a4390c66ed8175ef74db7067 +refs/heads/master: 9a5a2cac9f99c98d9d15cec17b1904f29d0e8009 diff --git a/trunk/drivers/xen/manage.c b/trunk/drivers/xen/manage.c index 0d61db1e7b49..4b5b84837ee1 100644 --- a/trunk/drivers/xen/manage.c +++ b/trunk/drivers/xen/manage.c @@ -62,14 +62,15 @@ static int xen_suspend(void *data) gnttab_resume(); xen_mm_unpin_all(); - sysdev_resume(); - if (!*cancelled) { xen_irq_resume(); xen_console_resume(); xen_timer_resume(); } + sysdev_resume(); + device_power_up(PMSG_RESUME); + return 0; }