summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-01-23 08:23:04 -0600
committerRob Herring <robh@kernel.org>2014-01-23 08:23:04 -0600
commit619d144013cb30a19d1dfa8294fbe29fcc2c2363 (patch)
treefa98b07a2d7062b40759d1b969f6aef6ae7cf409 /drivers/of
parent9b9900aa60e271a0c64fd1e16beb07e341e7d626 (diff)
parent2a9330010bea5982a5c6593824bc036bf62d67b7 (diff)
downloadlinux-619d144013cb30a19d1dfa8294fbe29fcc2c2363.tar.bz2
Merge remote-tracking branch 'grant/devicetree/next' into for-3.14
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 8d007d8b8c78..ff85450d5683 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -415,6 +415,9 @@ static int __of_device_is_available(const struct device_node *device)
const char *status;
int statlen;
+ if (!device)
+ return 0;
+
status = __of_get_property(device, "status", &statlen);
if (status == NULL)
return 1;