From 02f1baa4eef67d07f8f1ebc6cc31369d65819d63 Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Wed, 11 Jan 2012 09:09:58 +0000 Subject: [PATCH] --- yaml --- r: 287645 b: refs/heads/master c: 778a785f02ad846446e91dab49331bd7d853c514 h: refs/heads/master i: 287643: a8f78c28b166cde66d1262861ed91ccbe6563c67 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/ppc-pci.h | 5 +++++ trunk/arch/powerpc/platforms/pseries/eeh.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5586ed91b7e9..7b13d02491e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 444080d13d05dc38d07dd3bf751d38bce7ab7c72 +refs/heads/master: 778a785f02ad846446e91dab49331bd7d853c514 diff --git a/trunk/arch/powerpc/include/asm/ppc-pci.h b/trunk/arch/powerpc/include/asm/ppc-pci.h index 43268f15004e..6d422979ebaf 100644 --- a/trunk/arch/powerpc/include/asm/ppc-pci.h +++ b/trunk/arch/powerpc/include/asm/ppc-pci.h @@ -142,6 +142,11 @@ static inline const char *eeh_pci_name(struct pci_dev *pdev) return pdev ? pci_name(pdev) : ""; } +static inline const char *eeh_driver_name(struct pci_dev *pdev) +{ + return (pdev && pdev->driver) ? pdev->driver->name : ""; +} + #endif /* CONFIG_EEH */ #else /* CONFIG_PCI */ diff --git a/trunk/arch/powerpc/platforms/pseries/eeh.c b/trunk/arch/powerpc/platforms/pseries/eeh.c index 565869022e3d..c0b40af4ce4f 100644 --- a/trunk/arch/powerpc/platforms/pseries/eeh.c +++ b/trunk/arch/powerpc/platforms/pseries/eeh.c @@ -551,9 +551,9 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev) printk (KERN_ERR "EEH: %d reads ignored for recovering device at " "location=%s driver=%s pci addr=%s\n", pdn->eeh_check_count, location, - dev->driver->name, eeh_pci_name(dev)); + eeh_driver_name(dev), eeh_pci_name(dev)); printk (KERN_ERR "EEH: Might be infinite loop in %s driver\n", - dev->driver->name); + eeh_driver_name(dev)); dump_stack(); } goto dn_unlock;