diff --git a/[refs] b/[refs]
index f7c3f77d2339..8ef3ad620d11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f4d3218e95d48de2951dcf2bea619ea49ef93de
+refs/heads/master: 1a4b1a41b8a3d5256019854e851beed063b34344
diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
index b1187ff31d89..f3f94a5c068f 100644
--- a/trunk/drivers/pci/probe.c
+++ b/trunk/drivers/pci/probe.c
@@ -1351,7 +1351,8 @@ static int pcie_find_smpss(struct pci_dev *dev, void *data)
 	 * will occur as normal.
 	 */
 	if (dev->is_hotplug_bridge && (!list_is_singular(&dev->bus->devices) ||
-	    dev->bus->self->pcie_type != PCI_EXP_TYPE_ROOT_PORT))
+	     (dev->bus->self &&
+	      dev->bus->self->pcie_type != PCI_EXP_TYPE_ROOT_PORT)))
 		*smpss = 0;
 
 	if (*smpss > dev->pcie_mpss)