Commit 83448bf7 authored Mar 19, 2012 by Jan Beulich Committed by Wim Van Sebroeck Mar 27, 2012

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>

parent ccd4144d

drivers/watchdog/xen_wdt.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}