diff options
| author | linas <linas@austin.ibm.com> | 2005-12-02 01:42:32 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-10 05:32:54 +0100 |
| commit | 0f17574a651884c721e1a33051719e59deb13c18 (patch) | |
| tree | 5de62fde0c71554b6eb11c25f5167873c3f5d996 /arch/powerpc | |
| parent | powerpc: Fix up some compile errors in the PCI error recovery code (diff) | |
| download | linux-0f17574a651884c721e1a33051719e59deb13c18.tar.xz linux-0f17574a651884c721e1a33051719e59deb13c18.zip | |
[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/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/pseries/eeh.c | 3 |
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) 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 |