From 9de45d867389117e74d7a5b2272f25722f1e9ad5 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 8 Jun 2010 07:48:25 -0600
Subject: [PATCH] --- yaml --- r: 204923 b: refs/heads/master c:
 60d599133011eaca6073696f6a86cd516854d547 h: refs/heads/master i:   204921:
 127e0223f180f8c58bd91d1952bf368625748641   204919:
 55e2338f9f795e7cbfca084b9a04456b741b96f5 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/of/platform.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 62171c12ba14..3d07711cd279 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1d4c3a76981addcd7669f404f75041435a04e6a
+refs/heads/master: 60d599133011eaca6073696f6a86cd516854d547
diff --git a/trunk/drivers/of/platform.c b/trunk/drivers/of/platform.c
index 5be008035b94..c52a798684a9 100644
--- a/trunk/drivers/of/platform.c
+++ b/trunk/drivers/of/platform.c
@@ -617,6 +617,8 @@ int of_platform_bus_probe(struct device_node *root,
 		root = of_find_node_by_path("/");
 	else
 		of_node_get(root);
+	if (root == NULL)
+		return -EINVAL;
 
 	pr_debug("of_platform_bus_probe()\n");
 	pr_debug(" starting at: %s\n", root->full_name);