From a855dba90f5d996e2b6ddf807305e8f9d803efd6 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 18 Mar 2011 10:21:29 -0600
Subject: [PATCH] --- yaml --- r: 241725 b: refs/heads/master c:
 a52f07ecd143baee51623b063be5007585748a4f h: refs/heads/master i:   241723:
 b6c5be1fcb0b7535280e3ad0a2968a1a0dbc5e09 v: v3

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

diff --git a/[refs] b/[refs]
index c7eb1e5f96df..c4d15dfb0a84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38e9e21dac33082f0440d24aefb3466bb18bfed6
+refs/heads/master: a52f07ecd143baee51623b063be5007585748a4f
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
index 710b53bfac6d..632ebae7f17a 100644
--- a/trunk/drivers/of/base.c
+++ b/trunk/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])