---

yaml --- r: 299400 b: refs/heads/master c: 186bab1 h: refs/heads/master v: v3
git-mirror · Apr 19, 2012 · 174c2a4 · 174c2a4
1 parent 58a4e3f
commit 174c2a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 	}