diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2009-02-17 00:15:45 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-03-20 13:48:04 -0400 |
commit | c2a3072e010943ac749794622f26b3ef54de25be (patch) | |
tree | 3cb9290ded157827f3cc48571e34cc5b10cba55f /drivers/pci/pci.c | |
parent | f92d4e29d785f1d4217dee7f1ae6ff7140547ed5 (diff) |
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>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 0b3e20f1b6f7..0cfed9e28ea1 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) | |||
1484 | if (!pin) | 1484 | if (!pin) |
1485 | return -1; | 1485 | return -1; |
1486 | 1486 | ||
1487 | while (dev->bus->self) { | 1487 | while (dev->bus->parent) { |
1488 | pin = pci_swizzle_interrupt_pin(dev, pin); | 1488 | pin = pci_swizzle_interrupt_pin(dev, pin); |
1489 | dev = dev->bus->self; | 1489 | dev = dev->bus->self; |
1490 | } | 1490 | } |