---

yaml --- r: 241725 b: refs/heads/master c: a52f07e h: refs/heads/master i: 241723: b6c5be1 v: v3
git-mirror · Mar 23, 2011 · a855dba · a855dba
1 parent 771db6f
commit a855dba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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])