aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorlinas <linas@austin.ibm.com>2005-12-01 19:42:32 -0500
committerPaul Mackerras <paulus@samba.org>2006-01-09 23:32:54 -0500
commit0f17574a651884c721e1a33051719e59deb13c18 (patch)
tree5de62fde0c71554b6eb11c25f5167873c3f5d996 /arch
parent18eb3b398d92028e6f09f0423aa4e2a7b1096db3 (diff)
[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)
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/pseries/eeh.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 136365c1f8e1..17cea7f2afd3 100644
--- 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)
698 int enable; 698 int enable;
699 struct pci_dn *pdn = PCI_DN(dn); 699 struct pci_dn *pdn = PCI_DN(dn);
700 700
701 pdn->class_code = *class_code; 701 pdn->class_code = 0;
702 pdn->eeh_mode = 0; 702 pdn->eeh_mode = 0;
703 pdn->eeh_check_count = 0; 703 pdn->eeh_check_count = 0;
704 pdn->eeh_freeze_count = 0; 704 pdn->eeh_freeze_count = 0;
@@ -715,6 +715,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
715 pdn->eeh_mode |= EEH_MODE_NOCHECK; 715 pdn->eeh_mode |= EEH_MODE_NOCHECK;
716 return NULL; 716 return NULL;
717 } 717 }
718 pdn->class_code = *class_code;
718 719
719 /* 720 /*
720 * Now decide if we are going to "Disable" EEH checking 721 * Now decide if we are going to "Disable" EEH checking