[PATCH] powerpc/pseries: dlpar-add crash on null pointer deref

This fixes a crash on null-pointer deref during dlpar slot addition.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
(cherry picked from 1c87c0f84943fbbc91826967ff4fea1b059a526f commit)

diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 136365c1f8e1d11b5085d3b050372d55596fc784..17cea7f2afd3a5dca0e918474ff83ea40fb05d6e 100644 (file)
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -698,7 +698,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
        int enable;
        struct pci_dn *pdn = PCI_DN(dn);
 
-       pdn->class_code = *class_code;
+       pdn->class_code = 0;
        pdn->eeh_mode = 0;
        pdn->eeh_check_count = 0;
        pdn->eeh_freeze_count = 0;
@@ -715,6 +715,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
                pdn->eeh_mode |= EEH_MODE_NOCHECK;
                return NULL;
        }
+       pdn->class_code = *class_code;
 
        /*
         * Now decide if we are going to "Disable" EEH checking