---

yaml --- r: 13743 b: refs/heads/master c: fe98aea h: refs/heads/master i: 13741: 9fe0361 13739: 2bcf428 13735: 6102d2b 13727: ec734c6 v: v3
git-mirror · Nov 10, 2005 · 5d14dae · 5d14dae
1 parent 98b44bc
commit 5d14dae
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: d9564ad11454581f85b77026f290f4bb24eecf25
+refs/heads/master: fe98aeab8494cf431ef62e080cbe1dc1b6f5bd49
diff --git 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;
 	}