summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2011-02-21 19:28:58 +0000
committerWim Van Sebroeck <wim@iguana.be>2011-03-14 10:40:30 +0000
commit943413c5b6e117a7eca029e3b07704d3b230d938 (patch)
tree377bf398a5b9c4e7520d107c5cebc933861b7661 /drivers
parent6899a8e13f76f37029084c891312e2cfad1305c8 (diff)
downloadlinux-3.10-943413c5b6e117a7eca029e3b07704d3b230d938.tar.gz
linux-3.10-943413c5b6e117a7eca029e3b07704d3b230d938.tar.bz2
linux-3.10-943413c5b6e117a7eca029e3b07704d3b230d938.zip
watchdog: w83697ug_wdt: Fix set bit 0 to activate GPIO2
outb_p(c || 0x01, WDT_EFDR); -> || should be | Reported-By: Toralf Förster <toralf.foerster@gmx.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/w83697ug_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c
index a6c12dec91a..df2a64dc967 100644
--- a/drivers/watchdog/w83697ug_wdt.c
+++ b/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;
}