---

yaml --- r: 40241 b: refs/heads/master c: b7b9868 h: refs/heads/master i: 40239: 3fa5a29 v: v3
git-mirror · Oct 4, 2006 · 7932234 · 7932234
1 parent e9d4e98
commit 7932234
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa69afd3c224252890cb30864dc648d1399dd9fe
+refs/heads/master: b7b9868ba6f528d60e5869b4a6aad1fe49838b03
diff --git a/trunk/drivers/char/watchdog/w83697hf_wdt.c b/trunk/drivers/char/watchdog/w83697hf_wdt.c
@@ -123,20 +123,18 @@ w83697hf_deselect_wdt(void)
 static void
 w83697hf_init(void)
 {
-	unsigned char t;
+	unsigned char bbuf;
 
 	w83697hf_select_wdt();
 
-	w83697hf_set_reg(0x29, 0x20);	/* Set pin 119 to WDTO# mode (= CR29, WDT0) */
+	bbuf = w83697hf_get_reg(0x29);
+	bbuf &= ~0x60;
+	bbuf |= 0x20;
+	w83697hf_set_reg(0x29, bbuf);	/* Set pin 119 to WDTO# mode (= CR29, WDT0) */
 
-	t = w83697hf_get_reg(0xF3);	/* Read CRF3 */
-	if (t != 0) {
-		printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
-		w83697hf_set_reg(0xF3, timeout);	/* Write new timeout */
-	}
-	t = w83697hf_get_reg(0xF4);	/* Read CRF4 */
-	t&=~0x0C;			/* set second mode & disable keyboard turning off watchdog */
-	w83697hf_set_reg(0xF4, t);	/* Write back to CRF4 */
+	bbuf = w83697hf_get_reg(0xF3);
+	bbuf &= ~0x04;
+	w83697hf_set_reg(0xF3, bbuf);	/* Count mode is seconds */
 
 	w83697hf_deselect_wdt();
 }