diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-14 08:49:05 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-14 09:13:31 +0200 |
| commit | 89a51df5ab1d38b257300b8ac940bbac3bb0eb9b (patch) | |
| tree | fd7a905d056cf98088657b2e365909d30b84b11a /arch/powerpc/kernel/eeh.c | |
| parent | powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH (diff) | |
| download | linux-89a51df5ab1d38b257300b8ac940bbac3bb0eb9b.tar.xz linux-89a51df5ab1d38b257300b8ac940bbac3bb0eb9b.zip | |
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
The recent change to the EEH probing causes a crash on Cell because
eeh_ops is NULL.
Check if EEH is enabled and if not bail out.
Fixes: ff57b454ddb9 ("powerpc/eeh: Do probe on pci_dn")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/eeh.c')
| -rw-r--r-- | arch/powerpc/kernel/eeh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 76253eb146be..a4c62eb0ee48 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1053,7 +1053,7 @@ void eeh_add_device_early(struct pci_dn *pdn) struct pci_controller *phb; struct eeh_dev *edev = pdn_to_eeh_dev(pdn); - if (!edev) + if (!edev || !eeh_enabled()) return; /* USB Bus children of PCI devices will not have BUID's */ |