Merge branch 'dt/linus' into HEAD

2018-09-19 15:10:03 -07:00
parent 00b7d1cf46 e54192b48d
commit 362ce2b8e5
1 changed files with 3 additions and 0 deletions
--- 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;