From: Guenter Roeck <linux@roeck-us.net>
Date: Sat, 17 Aug 2013 20:58:46 +0000 (-0700)
Subject: watchdog: w83627hf_wdt: Reset watchdog trigger during initialization
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ea3d4011a871e1802e201086195c61e6dbeaf6d5;p=linux.git

watchdog: w83627hf_wdt: Reset watchdog trigger during initialization

If the watchdog has already triggered for whatever reason, it won't restart
unless the trigger is reset.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
---

diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 6937306e90dda..b1da0c18fd1ac 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -217,8 +217,8 @@ static int w83627hf_init(struct watchdog_device *wdog, enum chips chip)
 	t = superio_inb(cr_wdt_control) & ~0x0C;
 	superio_outb(cr_wdt_control, t);
 
-	/* disable keyboard & mouse turning off watchdog */
-	t = superio_inb(0xF7) & ~0xC0;
+	/* reset trigger, disable keyboard & mouse turning off watchdog */
+	t = superio_inb(0xF7) & ~0xD0;
 	superio_outb(0xF7, t);
 
 	superio_exit();