diff options
| author | Jan Beulich <JBeulich@suse.com> | 2012-03-19 10:30:33 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2012-03-27 20:13:43 +0200 |
| commit | 83448bf7867917d5fd104e65275d8e153f3293a8 (patch) | |
| tree | 565e83415dae4ee4a4b31e3213898f9017418bf3 /drivers/watchdog/xen_wdt.c | |
| parent | watchdog: fix compiler error for missing parenthesis (diff) | |
| download | linux-83448bf7867917d5fd104e65275d8e153f3293a8.tar.xz linux-83448bf7867917d5fd104e65275d8e153f3293a8.zip | |
watchdog: xen: don't unconditionally enable the watchdog during resume
This was found to be a problem particularly after guest migration.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reported-by: Wouter de Geus <benv-xensource.com@junerules.com>
Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Tested-by: Wouter de Geus <benv-xensource.com@junerules.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/xen_wdt.c')
| -rw-r--r-- | drivers/watchdog/xen_wdt.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c index 79aa7f96c246..e04fd6cf2121 100644 --- a/drivers/watchdog/xen_wdt.c +++ b/drivers/watchdog/xen_wdt.c @@ -296,11 +296,18 @@ static void xen_wdt_shutdown(struct platform_device *dev) static int xen_wdt_suspend(struct platform_device *dev, pm_message_t state) { - return xen_wdt_stop(); + typeof(wdt.id) id = wdt.id; + int rc = xen_wdt_stop(); + + wdt.id = id; + return rc; } static int xen_wdt_resume(struct platform_device *dev) { + if (!wdt.id) + return 0; + wdt.id = 0; return xen_wdt_start(); } |