summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-16 17:13:42 +0400
committerPaul Mackerras <paulus@samba.org>2008-05-16 17:13:42 +0400
commitfcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch)
treea99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/of
parent541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff)
parentf26a3988917913b3d11b2bd741601a2c64ab9204 (diff)
downloadlinux-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.xz
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/base.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 9bd7c4a31253..23ffb7c0caf2 100644
--- a/drivers/of/base.c
+++ b/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) {