diff options
| -rw-r--r-- | drivers/pci/quirks.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 7dcaa09b3c20..50f2dd9e1bb2 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -1444,7 +1444,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID, quirk_netmos); | |||
| 1444 | static void __devinit quirk_e100_interrupt(struct pci_dev *dev) | 1444 | static void __devinit quirk_e100_interrupt(struct pci_dev *dev) |
| 1445 | { | 1445 | { |
| 1446 | u16 command; | 1446 | u16 command; |
| 1447 | u32 bar; | ||
| 1448 | u8 __iomem *csr; | 1447 | u8 __iomem *csr; |
| 1449 | u8 cmd_hi; | 1448 | u8 cmd_hi; |
| 1450 | 1449 | ||
| @@ -1476,12 +1475,12 @@ static void __devinit quirk_e100_interrupt(struct pci_dev *dev) | |||
| 1476 | * re-enable them when it's ready. | 1475 | * re-enable them when it's ready. |
| 1477 | */ | 1476 | */ |
| 1478 | pci_read_config_word(dev, PCI_COMMAND, &command); | 1477 | pci_read_config_word(dev, PCI_COMMAND, &command); |
| 1479 | pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar); | ||
| 1480 | 1478 | ||
| 1481 | if (!(command & PCI_COMMAND_MEMORY) || !bar) | 1479 | if (!(command & PCI_COMMAND_MEMORY) || !pci_resource_start(dev, 0)) |
| 1482 | return; | 1480 | return; |
| 1483 | 1481 | ||
| 1484 | csr = ioremap(bar, 8); | 1482 | /* Convert from PCI bus to resource space. */ |
| 1483 | csr = ioremap(pci_resource_start(dev, 0), 8); | ||
| 1485 | if (!csr) { | 1484 | if (!csr) { |
| 1486 | printk(KERN_WARNING "PCI: Can't map %s e100 registers\n", | 1485 | printk(KERN_WARNING "PCI: Can't map %s e100 registers\n", |
| 1487 | pci_name(dev)); | 1486 | pci_name(dev)); |
