git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
watchdog
/
it8712f_wdt.c
diff --git
a/drivers/watchdog/it8712f_wdt.c
b/drivers/watchdog/it8712f_wdt.c
index ca90c5192596f8c4f47628ced8d2aabdcdd82b37..445b7e812112572ba82925576b6129ebafe8aed5 100644
(file)
--- 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();