---

yaml --- r: 189977 b: refs/heads/master c: b1183e0 h: refs/heads/master i: 189975: f4abb19 v: v3
git-mirror · Apr 16, 2010 · d827dc0 · d827dc0
1 parent ea08d09
commit d827dc0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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);