From 5418325e92cc1444a6ed7cd5652f0e52055938e8 Mon Sep 17 00:00:00 2001 From: Sonny Rao Date: Mon, 10 May 2010 15:13:41 +0000 Subject: [PATCH] --- yaml --- r: 196659 b: refs/heads/master c: 5b339bdf164d8aee394609768f7e2e4415b0252a h: refs/heads/master i: 196657: 52ae66387c895df8e88ff20dfd318c17416d8484 196655: a3f5124d4a3c4e642289a982a67ea953f53ec567 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci_of_scan.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1a796b50a5f1..a7427ef09c0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1263c71448aa70afb6097fdedf93c3dff5a7a15 +refs/heads/master: 5b339bdf164d8aee394609768f7e2e4415b0252a diff --git a/trunk/arch/powerpc/kernel/pci_of_scan.c b/trunk/arch/powerpc/kernel/pci_of_scan.c index cd11d5ca80df..6ddb795f83e8 100644 --- a/trunk/arch/powerpc/kernel/pci_of_scan.c +++ b/trunk/arch/powerpc/kernel/pci_of_scan.c @@ -310,6 +310,8 @@ static void __devinit __of_scan_bus(struct device_node *node, /* Scan direct children */ for_each_child_of_node(node, child) { pr_debug(" * %s\n", child->full_name); + if (!of_device_is_available(child)) + continue; reg = of_get_property(child, "reg", ®len); if (reg == NULL || reglen < 20) continue;