diff options
| author | Colin Cross <ccross@android.com> | 2012-04-27 14:03:45 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-27 14:03:45 -0700 |
| commit | 957265bd4fe182af757886f117416d66f68854aa (patch) | |
| tree | 177cee182ea61611f0b80db704203bf72ee4f3cb /drivers/xen/manage.c | |
| parent | 60c98d9abbd1ff3274b904027690f3c33d656250 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
Merge commit 'v3.4-rc4' into android-3.4
Diffstat (limited to 'drivers/xen/manage.c')
| -rw-r--r-- | drivers/xen/manage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 9e14ae6cd49..412b96cc530 100644 --- a/drivers/xen/manage.c +++ b/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; } |