From 5d14dae51f4dc8da95358c431394c54d68c43e93 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Thu, 3 Nov 2005 18:51:17 -0600 Subject: [PATCH] --- yaml --- r: 13743 b: refs/heads/master c: fe98aeab8494cf431ef62e080cbe1dc1b6f5bd49 h: refs/heads/master i: 13741: 9fe03619281233e3a48a26af676dbf1df0273382 13739: 2bcf4280804a69f934b62e4feaff054da611d243 13735: 6102d2b903bda3fb822949215421032f2a17d51f 13727: ec734c6c033b05dba2b2f684b481e628e4c8d469 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/rpadlpar_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; }