summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Paprocki <andrew@ishiboo.com>2008-04-02 08:43:19 +0200
committerWim Van Sebroeck <wim@iguana.be>2008-04-06 21:12:22 +0200
commitcc1020f15ad0f843c0111bf4b77bdfaabca79571 (patch)
tree8bb1d0fc8804bd5bc3af8d02fd2ac953bb3e2e8a /drivers
parentMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf... (diff)
downloadlinux-cc1020f15ad0f843c0111bf4b77bdfaabca79571.tar.xz
linux-cc1020f15ad0f843c0111bf4b77bdfaabca79571.zip
[WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog
I noticed this while testing the latest code. I'm not sure if it is required, but the normal (or LSB) timeout value is set to zero, so the MSB should be as well to stay consistent. If the chip revision is >= 8, set MSB of the 16-bit timeout value to zero when disabling the watchdog in it8712f_wdt_disable(). Signed-off-by: Andrew Paprocki <andrew@ishiboo.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
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();