Skip to content

Commit

Permalink
powerpc/pci: Fix checking for child bridges in PCI code.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Grant Likely authored and Benjamin Herrenschmidt committed Aug 24, 2010
1 parent c686ecf commit 76ec01d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/powerpc/kernel/pci_of_scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down

0 comments on commit 76ec01d

Please sign in to comment.