powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 14 Apr 2015 06:49:05 +0000 (16:49 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 14 Apr 2015 07:13:31 +0000 (17:13 +1000)
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>
arch/powerpc/kernel/eeh.c

index 76253eb146be2e6865a146fd76e4416da40b4421..a4c62eb0ee48c8f5ca9c64f9c64dc780df6e1b3a 100644 (file)
@@ -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 */