Merge 3.14-rc4 into char-misc-linus

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / watchdog / w83627hf_wdt.c

diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 6937306..b1da0c1 100644 (file)
--- 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();