summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2013-08-17 13:58:46 -0700
committerWim Van Sebroeck <wim@iguana.be>2014-01-28 21:35:40 +0100
commitea3d4011a871e1802e201086195c61e6dbeaf6d5 (patch)
tree2b208d454661b8ec2e489469868f06ff897df645 /drivers/watchdog
parent7b6d0b6ad49e55f8b82dbf233ece4e091417a738 (diff)
downloadlinux-ea3d4011a871e1802e201086195c61e6dbeaf6d5.tar.gz
linux-ea3d4011a871e1802e201086195c61e6dbeaf6d5.tar.bz2
linux-ea3d4011a871e1802e201086195c61e6dbeaf6d5.zip
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>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/w83627hf_wdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 6937306e90dd..b1da0c18fd1a 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();