From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Tue, 17 Feb 2009 05:15:45 +0000 (+0900)
Subject: PCI: fix wrong assumption in pci_get_interrupt_pin
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c2a3072e010943ac749794622f26b3ef54de25be;p=linux-2.6-omap-h63xx.git

PCI: fix wrong assumption in pci_get_interrupt_pin

Current pci_get_interrupt_pin() seems to have an assumption that
pci_bus->self is NULL on the root pci bus. But it might not be true on
some platforms. Because of this wrong assumption, current
pci_get_interrupt_pin() might cause endless loop. We must check
pci_bus->parent instead.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 0b3e20f1b6f..0cfed9e28ea 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1484,7 +1484,7 @@ pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge)
 	if (!pin)
 		return -1;
 
-	while (dev->bus->self) {
+	while (dev->bus->parent) {
 		pin = pci_swizzle_interrupt_pin(dev, pin);
 		dev = dev->bus->self;
 	}