]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
powerpc/eeh: Enhance converting EEH dev
authorGavin Shan <shangw@linux.vnet.ibm.com>
Wed, 5 Jun 2013 07:34:03 +0000 (15:34 +0800)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 20 Jun 2013 07:04:36 +0000 (17:04 +1000)
Under some special circumstances, the EEH device doesn't have the
associated device tree node or PCI device. The patch enhances those
functions converting EEH device to device tree node or PCI device
accordingly to avoid unnecessary system crash.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/eeh.h

index a80e32b46c118ee4166b590be84a6a2b898c0d0c..e32c3c53eb8b8d3b71e06caf0a865667ab1e90dc 100644 (file)
@@ -95,12 +95,12 @@ struct eeh_dev {
 
 static inline struct device_node *eeh_dev_to_of_node(struct eeh_dev *edev)
 {
-       return edev->dn;
+       return edev ? edev->dn : NULL;
 }
 
 static inline struct pci_dev *eeh_dev_to_pci_dev(struct eeh_dev *edev)
 {
-       return edev->pdev;
+       return edev ? edev->pdev : NULL;
 }
 
 /*