---

yaml --- r: 209951 b: refs/heads/master c: 76ec01d h: refs/heads/master i: 209949: 0b4113b 209947: d8ffa99 209943: 11cffd8 209935: fd3dd6b 209919: 9cf3cd8 v: v3
git-mirror · Aug 24, 2010 · 3f5e392 · 3f5e392
1 parent 37daeb5
commit 3f5e392
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 		}
 	}
 }