[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>

diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c
index 20ceb5fe28b6d575dccb92bc1560cb88ea4d2d94..f0e96fbd6489ef6948b883aacbfd91be2264af6c 100644 (file)
--- 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);
 }