diff --git a/[refs] b/[refs]
index 6641a0fa5d49..0d9af3d03a78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cec08e7a948326b01555be6311480aa08e637de2
+refs/heads/master: 64e4566f6d590fbb284da061b9b664c2486dd2de
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
index 9bd7c4a31253..23ffb7c0caf2 100644
--- a/trunk/drivers/of/base.c
+++ b/trunk/drivers/of/base.c
@@ -65,6 +65,9 @@ struct property *of_find_property(const struct device_node *np,
 {
 	struct property *pp;
 
+	if (!np)
+		return NULL;
+
 	read_lock(&devtree_lock);
 	for (pp = np->properties; pp != 0; pp = pp->next) {
 		if (of_prop_cmp(pp->name, name) == 0) {