diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/watchdog/w83697ug_wdt.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/watchdog/w83697ug_wdt.c')
| -rw-r--r-- | drivers/watchdog/w83697ug_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c index a6c12dec91a1..be9c4d839e15 100644 --- a/drivers/watchdog/w83697ug_wdt.c +++ b/drivers/watchdog/w83697ug_wdt.c | |||
| @@ -87,10 +87,10 @@ static int w83697ug_select_wd_register(void) | |||
| 87 | outb_p(0x87, WDT_EFER); /* Enter extended function mode */ | 87 | outb_p(0x87, WDT_EFER); /* Enter extended function mode */ |
| 88 | outb_p(0x87, WDT_EFER); /* Again according to manual */ | 88 | outb_p(0x87, WDT_EFER); /* Again according to manual */ |
| 89 | 89 | ||
| 90 | outb(0x20, WDT_EFER); /* check chip version */ | 90 | outb(0x20, WDT_EFER); /* check chip version */ |
| 91 | version = inb(WDT_EFDR); | 91 | version = inb(WDT_EFDR); |
| 92 | 92 | ||
| 93 | if (version == 0x68) { /* W83697UG */ | 93 | if (version == 0x68) { /* W83697UG */ |
| 94 | printk(KERN_INFO PFX "Watchdog chip version 0x%02x = " | 94 | printk(KERN_INFO PFX "Watchdog chip version 0x%02x = " |
| 95 | "W83697UG/UF found at 0x%04x\n", version, wdt_io); | 95 | "W83697UG/UF found at 0x%04x\n", version, wdt_io); |
| 96 | 96 | ||
| @@ -109,7 +109,7 @@ static int w83697ug_select_wd_register(void) | |||
| 109 | outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */ | 109 | outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */ |
| 110 | outb_p(0x30, WDT_EFER); /* select CR30 */ | 110 | outb_p(0x30, WDT_EFER); /* select CR30 */ |
| 111 | c = inb_p(WDT_EFDR); | 111 | c = inb_p(WDT_EFDR); |
| 112 | outb_p(c || 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */ | 112 | outb_p(c | 0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */ |
| 113 | 113 | ||
| 114 | return 0; | 114 | return 0; |
| 115 | } | 115 | } |