diff options
-rw-r--r-- | arch/x86/pci/irq.c | 2 | ||||
-rw-r--r-- | drivers/pci/pci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 373b9afe6d44..399a172f047d 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
@@ -533,7 +533,7 @@ static int pirq_bios_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
533 | { | 533 | { |
534 | struct pci_dev *bridge; | 534 | struct pci_dev *bridge; |
535 | int pin = pci_get_interrupt_pin(dev, &bridge); | 535 | int pin = pci_get_interrupt_pin(dev, &bridge); |
536 | return pcibios_set_irq_routing(bridge, pin, irq); | 536 | return pcibios_set_irq_routing(bridge, pin - 1, irq); |
537 | } | 537 | } |
538 | 538 | ||
539 | #endif | 539 | #endif |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 3222f9022707..bd52ca4c2893 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1374,9 +1374,9 @@ pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge) | |||
1374 | pin = dev->pin; | 1374 | pin = dev->pin; |
1375 | if (!pin) | 1375 | if (!pin) |
1376 | return -1; | 1376 | return -1; |
1377 | pin--; | 1377 | |
1378 | while (dev->bus->self) { | 1378 | while (dev->bus->self) { |
1379 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; | 1379 | pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1; |
1380 | dev = dev->bus->self; | 1380 | dev = dev->bus->self; |
1381 | } | 1381 | } |
1382 | *bridge = dev; | 1382 | *bridge = dev; |