]> Pileus Git - ~andy/linux/commitdiff
watchdog: w83627hf_wdt: Reset watchdog trigger during initialization
authorGuenter Roeck <linux@roeck-us.net>
Sat, 17 Aug 2013 20:58:46 +0000 (13:58 -0700)
committerWim Van Sebroeck <wim@iguana.be>
Tue, 28 Jan 2014 20:35:40 +0000 (21:35 +0100)
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>
drivers/watchdog/w83627hf_wdt.c

index 6937306e90ddab16bf6bc7ea105c18ceca72de37..b1da0c18fd1ac4b9d02cdb9bf9245699a83d3e3c 100644 (file)
@@ -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();