summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/iTCO_wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2008-11-19 21:02:02 +0100
committerWim Van Sebroeck <wim@iguana.be>2008-11-21 09:34:32 +0100
commitc6904ddb976d99b77d91b78a0ce5bdfffb416c49 (patch)
treeb505969bd7823159c8f9ad3c2b6d49047eac34be /drivers/watchdog/iTCO_wdt.c
parent[WATCHDOG] iTCO_wdt : problem with rebooting on new ICH9 based motherboards (diff)
downloadlinux-c6904ddb976d99b77d91b78a0ce5bdfffb416c49.tar.xz
linux-c6904ddb976d99b77d91b78a0ce5bdfffb416c49.zip
[WATCHDOG] iTCO_wdt : correct status clearing
The iTCO_wdt code was not clearing the correct bits. It now clears the timeout status bit and then the SECOND_TO_STS bit and then the BOOT_STS bit. Note: we should first clear the SECOND_TO_STS bit before clearing the BOOT_STS bit. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/iTCO_wdt.c')
-rw-r--r--drivers/watchdog/iTCO_wdt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 75483000a87d..2b5409f5b4e6 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -684,8 +684,9 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
TCOBASE);
/* Clear out the (probably old) status */
- outb(0, TCO1_STS);
- outb(3, TCO2_STS);
+ outb(8, TCO1_STS); /* Clear the Time Out Status bit */
+ outb(2, TCO2_STS); /* Clear SECOND_TO_STS bit */
+ outb(4, TCO2_STS); /* Clear BOOT_STS bit */
/* Make sure the watchdog is not running */
iTCO_wdt_stop();