luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog: xen: don't unconditionally enable the watchdog during resume

Browse Source 
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>
This commit is contained in:
Jan Beulich 2012-03-19 09:30:33 +00:00 committed by Wim Van Sebroeck
parent ccd4144dd4
commit 83448bf786
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/watchdog/xen_wdt.c
View File

@ -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) 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) static int xen_wdt_resume(struct platform_device *dev)
{ {
if (!wdt.id)
return 0;
wdt.id = 0;
return xen_wdt_start(); return xen_wdt_start();
} }