From d827dc08afd2f0a30151f08f67737c3e7f7a6fab Mon Sep 17 00:00:00 2001
From: Marc Zyngier <maz@misterjones.org>
Date: Fri, 9 Apr 2010 17:43:33 +0100
Subject: [PATCH] --- yaml --- r: 189977 b: refs/heads/master c:
 b1183e064a3f95d27351b2d2c811b50bf4d770a4 h: refs/heads/master i:   189975:
 f4abb190f752cdc5c5ead375bfcde23f0f328f6e v: v3

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

diff --git a/[refs] b/[refs]
index 254930aa1cb0..83f293396d3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fb06571bbb5c72b4663c20f721323260ea802bf
+refs/heads/master: b1183e064a3f95d27351b2d2c811b50bf4d770a4
diff --git a/trunk/drivers/watchdog/max63xx_wdt.c b/trunk/drivers/watchdog/max63xx_wdt.c
index 75f3a83c0361..3053ff05ca41 100644
--- a/trunk/drivers/watchdog/max63xx_wdt.c
+++ b/trunk/drivers/watchdog/max63xx_wdt.c
@@ -154,9 +154,14 @@ static void max63xx_wdt_enable(struct max63xx_timeout *entry)
 
 static void max63xx_wdt_disable(void)
 {
+	u8 val;
+
 	spin_lock(&io_lock);
 
-	__raw_writeb(3, wdt_base);
+	val = __raw_readb(wdt_base);
+	val &= ~MAX6369_WDSET;
+	val |= 3;
+	__raw_writeb(val, wdt_base);
 
 	spin_unlock(&io_lock);