From 3f5e392004eb05d98abb61b46276792f294c75fc Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 18 Aug 2010 08:27:55 +0000
Subject: [PATCH] --- yaml --- r: 209951 b: refs/heads/master c:
 76ec01dbb70353928a9cee826502073ae928bbba h: refs/heads/master i:   209949:
 0b4113be2807cefcd06c9367457926b7ccd6aa6b   209947:
 d8ffa992418d3ddb422856c0e1e0bedd9915bf91   209943:
 11cffd83447f1c8bb61949122451c6572fa77d26   209935:
 fd3dd6b79ceda01665e7b5bff197cd100607322f   209919:
 9cf3cd8e43b557bc0e888142d517c53d9cbb544b v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/kernel/pci_of_scan.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c4a9f7ec87c4..9b7eba3701b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c686ecf5040d287a68d4fca7f1948472f556a6d3
+refs/heads/master: 76ec01dbb70353928a9cee826502073ae928bbba
diff --git a/trunk/arch/powerpc/kernel/pci_of_scan.c b/trunk/arch/powerpc/kernel/pci_of_scan.c
index 62dd363a9762..e751506323b4 100644
--- a/trunk/arch/powerpc/kernel/pci_of_scan.c
+++ b/trunk/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);
 		}
 	}
 }