From c26aea59c9c32ea409eeb97f07e974adcee17930 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Mon, 21 Feb 2011 19:28:58 +0000 Subject: [PATCH] --- yaml --- r: 234105 b: refs/heads/master c: 943413c5b6e117a7eca029e3b07704d3b230d938 h: refs/heads/master i: 234103: b007639156068c5ad6611d00044a3132a8007e9f v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/w83697ug_wdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 986b4d3577d8..5f898c8c5e65 100644 --- 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 index a6c12dec91a1..df2a64dc9672 100644 --- 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; }