diff --git a/[refs] b/[refs]
index a860f2ccb59a..f1781f7eb4f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9564ad11454581f85b77026f290f4bb24eecf25
+refs/heads/master: fe98aeab8494cf431ef62e080cbe1dc1b6f5bd49
diff --git a/trunk/drivers/pci/hotplug/rpadlpar_core.c b/trunk/drivers/pci/hotplug/rpadlpar_core.c
index fcb66b9a0e28..e8593a60ee89 100644
--- a/trunk/drivers/pci/hotplug/rpadlpar_core.c
+++ b/trunk/drivers/pci/hotplug/rpadlpar_core.c
@@ -306,7 +306,7 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn)
 {
 	struct pci_controller *phb;
 
-	if (PCI_DN(dn)->phb) {
+	if (PCI_DN(dn) && PCI_DN(dn)->phb) {
 		/* PHB already exists */
 		return -EINVAL;
 	}