summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-06 16:11:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-06 16:11:22 -0700
commitc28cf0fdcd38e912fa72258d78cb213b716247d6 (patch)
tree105f87dc9fb41662a723c167b92c04cb4804adea /drivers
parent64ba4f230d30b089bc89db2e59d02c1efa5ac769 (diff)
parentcc1020f15ad0f843c0111bf4b77bdfaabca79571 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/it8712f_wdt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
index ca90c5192596..445b7e812112 100644
--- a/drivers/watchdog/it8712f_wdt.c
+++ b/drivers/watchdog/it8712f_wdt.c
@@ -200,6 +200,8 @@ it8712f_wdt_disable(void)
superio_outb(0, WDT_CONFIG);
superio_outb(0, WDT_CONTROL);
+ if (revision >= 0x08)
+ superio_outb(0, WDT_TIMEOUT + 1);
superio_outb(0, WDT_TIMEOUT);
superio_exit();