From 0284a9107afa654808904cda71085a4af8896cea Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 9 Dec 2008 16:11:46 -0700
Subject: [PATCH] --- yaml --- r: 127363 b: refs/heads/master c:
 878f2e50fd1cfea575cdca5bf019c2175dc64131 h: refs/heads/master i:   127361:
 6bfe8efd7a9401e570c8bf815ce27482beacdab2   127359:
 3da4efa3c396747c21ef2c31429e4f8f7fe4bce2 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/pci/irq.c | 2 +-
 trunk/drivers/pci/pci.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5cbb90d4feb4..756cb9aff4c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98d3333a13029ab07ca1d1bfb9bfa138ea76c3c0
+refs/heads/master: 878f2e50fd1cfea575cdca5bf019c2175dc64131
diff --git a/trunk/arch/x86/pci/irq.c b/trunk/arch/x86/pci/irq.c
index 373b9afe6d44..399a172f047d 100644
--- a/trunk/arch/x86/pci/irq.c
+++ b/trunk/arch/x86/pci/irq.c
@@ -533,7 +533,7 @@ static int pirq_bios_set(struct pci_dev *router, struct pci_dev *dev, int pirq,
 {
 	struct pci_dev *bridge;
 	int pin = pci_get_interrupt_pin(dev, &bridge);
-	return pcibios_set_irq_routing(bridge, pin, irq);
+	return pcibios_set_irq_routing(bridge, pin - 1, irq);
 }
 
 #endif
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 3222f9022707..bd52ca4c2893 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -1374,9 +1374,9 @@ pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge)
 	pin = dev->pin;
 	if (!pin)
 		return -1;
-	pin--;
+
 	while (dev->bus->self) {
-		pin = (pin + PCI_SLOT(dev->devfn)) % 4;
+		pin = (((pin - 1) + PCI_SLOT(dev->devfn)) % 4) + 1;
 		dev = dev->bus->self;
 	}
 	*bridge = dev;