lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] iTCO_wdt.c - fix ACPI Base register
This commit is contained in:
Linus Torvalds
2007-05-11 16:05:43 -07:00
parent fb2c922b85 5c34202b8b
commit c5b7bede71
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/watchdog/iTCO_wdt.c
View File

@@ -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 * ACPIBASE is bits [15:7] from 0x40-0x43
*/ */
pci_read_config_dword(pdev, 0x40, &base_address); pci_read_config_dword(pdev, 0x40, &base_address);
base_address &= 0x00007f80; base_address &= 0x0000ff80;
if (base_address == 0x00000000) { if (base_address == 0x00000000) {
/* Something's wrong here, ACPIBASE has to be set */ /* Something's wrong here, ACPIBASE has to be set */
printk(KERN_ERR PFX "failed to get TCOBASE address\n"); printk(KERN_ERR PFX "failed to get TCOBASE address\n");