---

yaml --- r: 209942 b: refs/heads/master c: da9bef6 h: refs/heads/master v: v3
git-mirror · Aug 24, 2010 · 744c8d5 · 744c8d5
1 parent 61e5edc
commit 744c8d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fba610ec94a1290fc299ea051e47d55da9059ba
+refs/heads/master: da9bef6735d3c5c1c0cd16717acee18d56dd59f5
diff --git a/trunk/arch/powerpc/kernel/pci_of_scan.c b/trunk/arch/powerpc/kernel/pci_of_scan.c
@@ -336,8 +336,7 @@ 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);
-			if (dev)
-				of_scan_pci_bridge(child, dev);
+			of_scan_pci_bridge(child, dev);
 		}
 	}
 }