diff options
| author | Linas Vepstas <linas@austin.ibm.com> | 2006-03-30 15:27:33 -0600 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-01 22:37:02 +1100 |
| commit | a219be2cf48fc77e73936d07187a5f8d1bca2511 (patch) | |
| tree | e16174f06e3ab2d5865b01666f565f5303b51cf6 /arch | |
| parent | b13a96cfb055fd4b9c61463f87534a6f406b174b (diff) | |
| download | op-kernel-dev-a219be2cf48fc77e73936d07187a5f8d1bca2511.zip op-kernel-dev-a219be2cf48fc77e73936d07187a5f8d1bca2511.tar.gz | |
[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 <linas@linas.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/pseries/eeh_driver.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 0c6b7d7..1fba695 100644 --- 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); } |
