Skip to contentSkip to conversation

powerpc/pseries: fix device name printing, again.

PATCH New Linas Vepstas 1 participant 1 message Mar 30, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

Paul, please apply and send upstram.

--linas

[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.

----

 arch/powerpc/platforms/pseries/eeh_driver.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
arch/powerpc/platforms/pseries/eeh_driver.c +4 -3
Index: linux-2.6.16-git6/arch/powerpc/platforms/pseries/eeh_driver.c
===================================================================
@@ -292,9 +292,10 @@ struct pci_dn * handle_eeh_events (struc
 	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);
 	}