From 2ed6c97fc34c1e5fe8b7d1f1da99983f1bac849f Mon Sep 17 00:00:00 2001
From: Naveen Gupta <ngupta@google.com>
Date: Wed, 17 Aug 2005 09:10:10 +0200
Subject: [PATCH] --- yaml --- r: 8803 b: refs/heads/master c:
 28562af3d4b21d687dd57c44006aeeed1036c781 h: refs/heads/master i:   8801:
 57e783d2663ed461c2e02b3bc59ee73176d5bd03   8799:
 6f940ccce34b2f1da38951744fe9535f441771b5 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/char/watchdog/i6300esb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c31498df912d..44a17af03f13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c69af038cad5e6ea86e927a17b70b49af1f7cbfa
+refs/heads/master: 28562af3d4b21d687dd57c44006aeeed1036c781
diff --git a/trunk/drivers/char/watchdog/i6300esb.c b/trunk/drivers/char/watchdog/i6300esb.c
index 20ceb5fe28b6..f0e96fbd6489 100644
--- a/trunk/drivers/char/watchdog/i6300esb.c
+++ b/trunk/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);
 }