aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2009-02-17 00:16:13 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-03-20 13:48:05 -0400
commitc74d724462d1845535667f4d3f720e02e3432e53 (patch)
tree2b41310b6710ee40fd26422a22cdb7e73fe80c1b /drivers/pci/pci.c
parentc2a3072e010943ac749794622f26b3ef54de25be (diff)
PCI: fix wrong assumption in pci_common_swizzle
Current pci_common_swizzle() seems to have a assumption that pci_bus->self is NULL on the pci root bus. But it might not be true on some platforms. Because of this wrong assumption, pci_common_swizzle() 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>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 0cfed9e28ea..8310dc2f943 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1504,7 +1504,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp)
1504{ 1504{
1505 u8 pin = *pinp; 1505 u8 pin = *pinp;
1506 1506
1507 while (dev->bus->self) { 1507 while (dev->bus->parent) {
1508 pin = pci_swizzle_interrupt_pin(dev, pin); 1508 pin = pci_swizzle_interrupt_pin(dev, pin);
1509 dev = dev->bus->self; 1509 dev = dev->bus->self;
1510 } 1510 }