summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Gupta <ngupta@google.com>2005-08-17 09:10:10 +0200
committerWim Van Sebroeck <wim@iguana.be>2005-09-11 21:48:46 +0200
commit28562af3d4b21d687dd57c44006aeeed1036c781 (patch)
tree46dd305650708846a09fbe41f3b9999803a8a7c4
parentc69af038cad5e6ea86e927a17b70b49af1f7cbfa (diff)
downloadblackbird-op-linux-28562af3d4b21d687dd57c44006aeeed1036c781.tar.gz
blackbird-op-linux-28562af3d4b21d687dd57c44006aeeed1036c781.zip
[WATCHDOG] i6300esb.c-WDT_ENABLE-bug
This patch sets the WDT_ENABLE bit of the Lock Register to enable the watchdog and WDT_LOCK bit only if nowayout is set. The old code always sets the WDT_LOCK bit of watchdog timer for Intel 6300ESB chipset. So, we end up locking the watchdog instead of enabling it. Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
-rw-r--r--drivers/char/watchdog/i6300esb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c
index 20ceb5fe28b6..f0e96fbd6489 100644
--- a/drivers/char/watchdog/i6300esb.c
+++ b/drivers/char/watchdog/i6300esb.c
@@ -97,7 +97,7 @@ static void esb_timer_start(void)
u8 val;
/* Enable or Enable + Lock? */
- val = 0x02 | nowayout ? 0x01 : 0x00;
+ val = 0x02 | (nowayout ? 0x01 : 0x00);
pci_write_config_byte(esb_pci, ESB_LOCK_REG, val);
}
OpenPOWER on IntegriCloud