From 174c2a40c80f2572256587eb21119c290e52b048 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 17 Apr 2012 14:35:49 -0400
Subject: [PATCH] --- yaml --- r: 299400 b: refs/heads/master c:
 186bab1ce04f99153b7eeb3348438b654c24c24b h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/manage.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 26bebb310d23..31d4de030bb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3066616ce23aad5719c23a0f21f32676402cb44b
+refs/heads/master: 186bab1ce04f99153b7eeb3348438b654c24c24b
diff --git a/trunk/drivers/xen/manage.c b/trunk/drivers/xen/manage.c
index 9e14ae6cd49c..412b96cc5305 100644
--- a/trunk/drivers/xen/manage.c
+++ b/trunk/drivers/xen/manage.c
@@ -132,6 +132,7 @@ static void do_suspend(void)
 	err = dpm_suspend_end(PMSG_FREEZE);
 	if (err) {
 		printk(KERN_ERR "dpm_suspend_end failed: %d\n", err);
+		si.cancelled = 0;
 		goto out_resume;
 	}