diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 10:15:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 10:15:43 -0700 |
| commit | 786c58b7275ae885a3cee9d5bcf8721d962861ac (patch) | |
| tree | 40997a988f66d449ff02f5c22853526aac35d773 /drivers/watchdog/w83697ug_wdt.c | |
| parent | 1eafbfeb7bdf59cfe173304c76188f3fd5f1fd05 (diff) | |
| parent | b77b708868c23737a4d25a474736cc924deb44f1 (diff) | |
| download | op-kernel-dev-786c58b7275ae885a3cee9d5bcf8721d962861ac.zip op-kernel-dev-786c58b7275ae885a3cee9d5bcf8721d962861ac.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: hpwdt: eliminate section mismatch warning
watchdog: w83697ug_wdt: Fix set bit 0 to activate GPIO2
watchdog: sch311x_wdt: fix printk condition
watchdog: sch311x_wdt: Fix LDN active check
watchdog: cpwd: Fix buffer-overflow
Diffstat (limited to 'drivers/watchdog/w83697ug_wdt.c')
| -rw-r--r-- | drivers/watchdog/w83697ug_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c index a6c12de..df2a64d 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; } |
