PCI: fix wrong assumption in pci_common_swizzle
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Tue, 17 Feb 2009 05:16:13 +0000 (14:16 +0900)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 20 Mar 2009 17:48:05 +0000 (10:48 -0700)
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>
drivers/pci/pci.c

index 0cfed9e28ea14490e0d973516e5053e79f92f59e..8310dc2f943b46455e372e196ebf2673839d3ff2 100644 (file)
@@ -1504,7 +1504,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp)
 {
        u8 pin = *pinp;
 
-       while (dev->bus->self) {
+       while (dev->bus->parent) {
                pin = pci_swizzle_interrupt_pin(dev, pin);
                dev = dev->bus->self;
        }