diff options
| author |   Rob Herring <robh@kernel.org> | 2014-01-23 08:23:04 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-01-23 08:23:04 -0600 |
| commit | 619d144013cb30a19d1dfa8294fbe29fcc2c2363 (patch) | |
| tree | fa98b07a2d7062b40759d1b969f6aef6ae7cf409 /drivers | |
| parent | DT: Add vendor prefix for Emerging Display Technologies (diff) | |
| parent | dt/bindings: submitting patches and ABI documents (diff) | |
| download | linux-dev-619d144013cb30a19d1dfa8294fbe29fcc2c2363.tar.xz linux-dev-619d144013cb30a19d1dfa8294fbe29fcc2c2363.zip | |
Merge remote-tracking branch 'grant/devicetree/next' into for-3.14
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/base.c | 3 |
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; |