Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/ppc64/kernel/pci_dn.c b/arch/ppc64/kernel/pci_dn.c
index 493bbe43f5b..1a443a7ada4 100644
--- a/arch/ppc64/kernel/pci_dn.c
+++ b/arch/ppc64/kernel/pci_dn.c
@@ -181,13 +181,14 @@ EXPORT_SYMBOL(fetch_dev_dn);
 static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
 {
         struct device_node *np = node;
-        struct pci_dn *pci;
+        struct pci_dn *pci = NULL;
         int err = NOTIFY_OK;
 
         switch (action) {
         case PSERIES_RECONFIG_ADD:
                 pci = np->parent->data;
-                update_dn_pci_info(np, pci->phb);
+                if (pci)
+                        update_dn_pci_info(np, pci->phb);
                 break;
         default:
                 err = NOTIFY_DONE;