summaryrefslogtreecommitdiffstats
path: root/drivers/pci/of.c
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2011-08-16 11:24:37 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-08-19 08:51:37 -0700
commit69566dd8be42dea7a22f625abc96e65bb4b45d1f (patch)
tree48e73a52bd8b79b5b8674243b54b5f2e346e5b9b /drivers/pci/of.c
parentdebc3b778508f59696ff188f0feca271dcbfa7d9 (diff)
downloadop-kernel-dev-69566dd8be42dea7a22f625abc96e65bb4b45d1f.zip
op-kernel-dev-69566dd8be42dea7a22f625abc96e65bb4b45d1f.tar.gz
PCI: OF: Don't crash when bridge parent is NULL.
In pcibios_get_phb_of_node(), we will crash while booting if bus->bridge->parent is NULL. Check for this case and avoid dereferencing the NULL pointer. Signed-off-by: David Daney <david.daney@cavium.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/of.c')
-rw-r--r--drivers/pci/of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index c94d37e..f092993 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -55,7 +55,7 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)
*/
if (bus->bridge->of_node)
return of_node_get(bus->bridge->of_node);
- if (bus->bridge->parent->of_node)
+ if (bus->bridge->parent && bus->bridge->parent->of_node)
return of_node_get(bus->bridge->parent->of_node);
return NULL;
}
OpenPOWER on IntegriCloud