---

yaml --- r: 263126 b: refs/heads/master c: 69566dd h: refs/heads/master v: v3
git-mirror · Aug 19, 2011 · dbcb455 · dbcb455
1 parent 76ce5e7
commit dbcb455
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: debc3b778508f59696ff188f0feca271dcbfa7d9
+refs/heads/master: 69566dd8be42dea7a22f625abc96e65bb4b45d1f
diff --git a/trunk/drivers/pci/of.c b/trunk/drivers/pci/of.c
@@ -55,7 +55,7 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)
 	 */
 	if (bus->bridge->of_node)
 		return of_node_get(bus->bridge->of_node);
-	if (bus->bridge->parent->of_node)
+	if (bus->bridge->parent && bus->bridge->parent->of_node)
 		return of_node_get(bus->bridge->parent->of_node);
 	return NULL;
 }