aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-06-08 09:48:25 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-07-19 00:39:36 -0400
commit60d599133011eaca6073696f6a86cd516854d547 (patch)
tree224ab8eea128c70db90320372f7dde0d79b95d2f /drivers/of
parentf1d4c3a76981addcd7669f404f75041435a04e6a (diff)
of/flattree: Fix crash when device tree absent
This patch fixes the condition where device tree support is compiled in, but no device tree was proved by firmware. It makes of_platform_bus_probe() explicitly check for a NULL device tree pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/platform.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 5be008035b94..c52a798684a9 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -617,6 +617,8 @@ int of_platform_bus_probe(struct device_node *root,
617 root = of_find_node_by_path("/"); 617 root = of_find_node_by_path("/");
618 else 618 else
619 of_node_get(root); 619 of_node_get(root);
620 if (root == NULL)
621 return -EINVAL;
620 622
621 pr_debug("of_platform_bus_probe()\n"); 623 pr_debug("of_platform_bus_probe()\n");
622 pr_debug(" starting at: %s\n", root->full_name); 624 pr_debug(" starting at: %s\n", root->full_name);