Skip to content

Commit

Permalink
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
Browse files Browse the repository at this point in the history
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: ff57b45 ("powerpc/eeh: Do probe on pci_dn")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Michael Ellerman committed Apr 14, 2015
1 parent 9a5cbce commit 89a51df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/eeh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 89a51df

Please sign in to comment.