From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 18 Aug 2010 08:27:55 +0000 (+0000)
Subject: powerpc/pci: Fix checking for child bridges in PCI code.
X-Git-Tag: v2.6.36-rc3~37^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76ec01dbb70353928a9cee826502073ae928bbba;p=profile%2Fcommon%2Fkernel-common.git

powerpc/pci: Fix checking for child bridges in PCI code.

pci_device_to_OF_node() can return null, and list_for_each_entry will
never enter the loop when dev is NULL, so it looks like this test is
a typo.

Reported-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 62dd363..e751506 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -336,7 +336,8 @@ static void __devinit __of_scan_bus(struct device_node *node,
 		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
 		    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
 			struct device_node *child = pci_device_to_OF_node(dev);
-			of_scan_pci_bridge(child, dev);
+			if (child)
+				of_scan_pci_bridge(child, dev);
 		}
 	}
 }