summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-10-17 08:10:24 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-10-17 08:10:24 +0200
commit9156b904baf981561a8ed486db52746b04d2e464 (patch)
tree1679c7e689d541f5c1a5663c2ee201036407857e /drivers/of
parent854cdfbe265ebd99619bc6edc594d59b07c156fe (diff)
parent22763dab152cb38c0912fe688f564a54aeaaea88 (diff)
downloadbarebox-9156b904baf981561a8ed486db52746b04d2e464.tar.gz
barebox-9156b904baf981561a8ed486db52746b04d2e464.tar.xz
Merge branch 'for-next/remoteproc'
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/base.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 63e0879f06..98ef5fc0d4 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1360,7 +1360,8 @@ static int __of_parse_phandle_with_args(const struct device_node *np,
np->full_name);
goto err;
}
- if (of_property_read_u32(node, cells_name, &count)) {
+ if (cells_name &&
+ of_property_read_u32(node, cells_name, &count)) {
pr_err("%s: could not get %s for %s\n",
np->full_name, cells_name,
node->full_name);