From 28562af3d4b21d687dd57c44006aeeed1036c781 Mon Sep 17 00:00:00 2001 From: Naveen Gupta Date: Wed, 17 Aug 2005 09:10:10 +0200 Subject: [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 Signed-off-by: David Hardeman Signed-off-by: Wim Van Sebroeck Signed-off-by: Andrew Morton --- drivers/char/watchdog/i6300esb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/char/watchdog') diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c index 20ceb5fe28b..f0e96fbd648 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); } -- cgit v1.2.3