From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 18 Mar 2011 16:21:29 +0000 (-0600)
Subject: dt: protect against NULL matches passed to of_match_node()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a52f07ecd143baee51623b063be5007585748a4f;p=mv-sheeva.git

dt: protect against NULL matches passed to of_match_node()

There are a few use cases where it is convenient to pass NULL to
of_match_node() and have it fail gracefully.  The patch adds a null
check to the beginning so taht it does so.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 710b53bfac6..632ebae7f17 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -496,6 +496,9 @@ EXPORT_SYMBOL(of_find_node_with_property);
 const struct of_device_id *of_match_node(const struct of_device_id *matches,
 					 const struct device_node *node)
 {
+	if (!matches)
+		return NULL;
+
 	while (matches->name[0] || matches->type[0] || matches->compatible[0]) {
 		int match = 1;
 		if (matches->name[0])