---

yaml --- r: 263779 b: refs/heads/master c: 1a4b1a4 h: refs/heads/master i: 263777: 89e0c18 263775: 07b2892 v: v3
git-mirror · Sep 13, 2011 · a4d3abb · a4d3abb
1 parent a2c3b76
commit a4d3abb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)