From 389eeac22b50e99b76dadff4cad74c20e6d232e9 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Thu, 30 Mar 2006 15:27:33 -0600 Subject: [PATCH] --- yaml --- r: 25042 b: refs/heads/master c: a219be2cf48fc77e73936d07187a5f8d1bca2511 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/eeh_driver.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f6b2f51dcd1b..2e2d69bcfde0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b13a96cfb055fd4b9c61463f87534a6f406b174b +refs/heads/master: a219be2cf48fc77e73936d07187a5f8d1bca2511 diff --git a/trunk/arch/powerpc/platforms/pseries/eeh_driver.c b/trunk/arch/powerpc/platforms/pseries/eeh_driver.c index 0c6b7d7ce9e8..1fba695e32e8 100644 --- a/trunk/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/trunk/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); }