---

yaml --- r: 234105 b: refs/heads/master c: 943413c h: refs/heads/master i: 234103: b007639 v: v3
git-mirror · Mar 14, 2011 · c26aea5 · c26aea5
1 parent 620212a
commit c26aea5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6899a8e13f76f37029084c891312e2cfad1305c8
+refs/heads/master: 943413c5b6e117a7eca029e3b07704d3b230d938
diff --git a/trunk/drivers/watchdog/w83697ug_wdt.c b/trunk/drivers/watchdog/w83697ug_wdt.c
@@ -109,7 +109,7 @@ static int w83697ug_select_wd_register(void)
 	outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */
 	outb_p(0x30, WDT_EFER); /* select CR30 */
 	c = inb_p(WDT_EFDR);
-	outb_p(c || 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
+	outb_p(c | 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
 
 	return 0;
 }