diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-26 15:55:52 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-26 15:55:52 -0600 |
| commit | a0f75f9d495b3905b4c658c1d813a127f558a350 (patch) | |
| tree | c91e6d70118ff2d15b129990cd82008acc286ce7 /drivers/pci/quirks.c | |
| parent | b5969138542fa2f5e4466c147abc0917ff78cefe (diff) | |
| parent | 15fd830dd310e6cf589478e5e1e7733caf68e777 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci
PCI: Add CircuitCo vendor ID and subsystem ID
PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
Diffstat (limited to 'drivers/pci/quirks.c')
| -rw-r--r-- | drivers/pci/quirks.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c3a04026cca..e85d23044ae 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1834,7 +1834,6 @@ static void quirk_e100_interrupt(struct pci_dev *dev) u16 command, pmcsr; u8 __iomem *csr; u8 cmd_hi; - int pm; switch (dev->device) { /* PCI IDs taken from drivers/net/e100.c */ @@ -1872,9 +1871,8 @@ static void quirk_e100_interrupt(struct pci_dev *dev) * Check that the device is in the D0 power state. If it's not, * there is no point to look any further. */ - pm = pci_find_capability(dev, PCI_CAP_ID_PM); - if (pm) { - pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr); + if (dev->pm_cap) { + pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) return; } |