diff --git a/[refs] b/[refs] index ba901b4a4294..8ecf25d09a95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 151ab36a2ea0b3181d103f7244636e0d16e685de +refs/heads/master: f92d4e29d785f1d4217dee7f1ae6ff7140547ed5 diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 55ec44a27e89..23362e8c696f 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/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) {