summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenji Kaneshige2009-02-17 06:15:16 +0100
committerJesse Barnes2009-03-20 18:48:04 +0100
commitf92d4e29d785f1d4217dee7f1ae6ff7140547ed5 (patch)
tree55e272ffb250af61e3de804565d538b0cb92b0eb
parentPCI: fix wrong assumption in pci_find_upstream_pcie_bridge (diff)
downloadkernel-qcow2-linux-f92d4e29d785f1d4217dee7f1ae6ff7140547ed5.tar.gz
kernel-qcow2-linux-f92d4e29d785f1d4217dee7f1ae6ff7140547ed5.tar.xz
kernel-qcow2-linux-f92d4e29d785f1d4217dee7f1ae6ff7140547ed5.zip
PCI: fix wrong assumption in pci_read_bridge_bases
Current pci_read_bridge_bases() has an assumption that pci_bus->self is NULL on the pci root bus (It checks pci_bus->self to see if the pci bus is root bus). But is might not true on some platforms. 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>
-rw-r--r--drivers/pci/probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 55ec44a27e89..23362e8c696f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -287,7 +287,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
struct resource *res;
int i;
- if (!dev) /* It's a host bus, nothing to read */
+ if (!child->parent) /* It's a host bus, nothing to read */
return;
if (dev->transparent) {