[PATCH] powerpc/pseries: fix device name printing, again.

The recent patch to print device names in EEH reset messages
was lacking ... this patch works better.

Signed-off-by: Linas Vepstas <[email protected]>
Signed-off-by: Paul Mackerras <[email protected]>

diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 0c6b7d7ce9e8a8d475280c12ae813f0db8484b8d..1fba695e32e82d113cbfcab42e18cfc69ae0da62 100644 (file)
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -293,9 +293,10 @@ void handle_eeh_events (struct eeh_event *event)
        frozen_pdn = PCI_DN(frozen_dn);
        frozen_pdn->eeh_freeze_count++;
 
-       pci_str = pci_name (frozen_pdn->pcidev);
-       drv_str = pcid_name (frozen_pdn->pcidev);
-       if (!pci_str) {
+       if (frozen_pdn->pcidev) {
+               pci_str = pci_name (frozen_pdn->pcidev);
+               drv_str = pcid_name (frozen_pdn->pcidev);
+       } else {
                pci_str = pci_name (event->dev);
                drv_str = pcid_name (event->dev);
        }