diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:42 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:42 -0400 |
| commit | e857b33d1879fc4284e3151222eee2415c1de88a (patch) | |
| tree | 455f060a62e510046f1fdb060af4587c3eddb009 /drivers/acpi/pci_irq.c | |
| parent | 9a38f4eec57cc5104b6a85bc6d0a91b268fbe803 (diff) | |
| parent | 1c48aa36ef301d7b07674313bae65ef2496801a7 (diff) | |
Merge branch 'bjorn-cleanups' into release
Diffstat (limited to 'drivers/acpi/pci_irq.c')
| -rw-r--r-- | drivers/acpi/pci_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 891bdf6679f..be6b9093f8d 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -319,7 +319,7 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin) */ bridge = dev->bus->self; while (bridge) { - pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1; + pin = pci_swizzle_interrupt_pin(dev, pin); if ((bridge->class >> 8) == PCI_CLASS_BRIDGE_CARDBUS) { /* PC card has the same IRQ as its cardbridge */ |