summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-09-19 15:10:03 -0700
committerRob Herring <robh@kernel.org>2018-09-19 15:10:03 -0700
commit362ce2b8e52be97dcc3986ce6f8dbe9e7a84e1a0 (patch)
tree9085e2170a5ea1abc3d8ec369ef2dd20736ad41f
parent00b7d1cf46676ad5e6338e80dc6230e1b6e71b86 (diff)
parente54192b48da75f025ae4b277925eaf6aca1d13bd (diff)
downloadlinux-362ce2b8e52be97dcc3986ce6f8dbe9e7a84e1a0.tar.bz2
Merge branch 'dt/linus' into HEAD
-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 a055cd1ef96d..17ae594b7014 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -140,6 +140,9 @@ void of_populate_phandle_cache(void)
if (np->phandle && np->phandle != OF_PHANDLE_ILLEGAL)
phandles++;
+ if (!phandles)
+ goto out;
+
cache_entries = roundup_pow_of_two(phandles);
phandle_cache_mask = cache_entries - 1;