aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-05-11 18:59:24 +0000
committerWim Van Sebroeck <wim@iguana.be>2007-05-11 18:59:24 +0000
commit0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0 (patch)
treefb86bcf061d17cfa6924ac08dccd242d8424201a /drivers/char/watchdog
parent[WATCHDOG] MTX-1 Watchdog driver (diff)
downloadlinux-dev-0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0.tar.xz
linux-dev-0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0.zip
[WATCHDOG] iTCO_wdt.c - fix ACPI Base register
The ACPI/PM base I/O address which is the base for the TCO registers is defined as bits [15:7] (highest bit is 31, lowest is 0) The code however only reads bits [14:7]. So base_address &= 0x00007f80; needs to be: base_address &= 0x0000ff80; This patch fixes this. Signed-off-by: Ate Wijma <ajwijma@hotmail.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char/watchdog')
-rw-r--r--drivers/char/watchdog/iTCO_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/char/watchdog/iTCO_wdt.c
index 3c9684ccd2f9..eac4f9b9f007 100644
--- a/drivers/char/watchdog/iTCO_wdt.c
+++ b/drivers/char/watchdog/iTCO_wdt.c
@@ -571,7 +571,7 @@ static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent,
* ACPIBASE is bits [15:7] from 0x40-0x43
*/
pci_read_config_dword(pdev, 0x40, &base_address);
- base_address &= 0x00007f80;
+ base_address &= 0x0000ff80;
if (base_address == 0x00000000) {
/* Something's wrong here, ACPIBASE has to be set */
printk(KERN_ERR PFX "failed to get TCOBASE address\n");