diff --git a/[refs] b/[refs]
index 35fbd13e07b4..dea7bdccab06 100644
--- 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
index c94d37ec55c8..f0929934bb7a 100644
--- 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;
 }