diff options
| author | Rob Herring <robh@kernel.org> | 2018-09-19 18:10:03 -0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-09-19 18:10:03 -0400 |
| commit | 362ce2b8e52be97dcc3986ce6f8dbe9e7a84e1a0 (patch) | |
| tree | 9085e2170a5ea1abc3d8ec369ef2dd20736ad41f /drivers/of | |
| parent | 00b7d1cf46676ad5e6338e80dc6230e1b6e71b86 (diff) | |
| parent | e54192b48da75f025ae4b277925eaf6aca1d13bd (diff) | |
Merge branch 'dt/linus' into HEAD
Diffstat (limited to 'drivers/of')
| -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 a055cd1ef96d..17ae594b7014 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c | |||
| @@ -140,6 +140,9 @@ void of_populate_phandle_cache(void) | |||
| 140 | if (np->phandle && np->phandle != OF_PHANDLE_ILLEGAL) | 140 | if (np->phandle && np->phandle != OF_PHANDLE_ILLEGAL) |
| 141 | phandles++; | 141 | phandles++; |
| 142 | 142 | ||
| 143 | if (!phandles) | ||
| 144 | goto out; | ||
| 145 | |||
| 143 | cache_entries = roundup_pow_of_two(phandles); | 146 | cache_entries = roundup_pow_of_two(phandles); |
| 144 | phandle_cache_mask = cache_entries - 1; | 147 | phandle_cache_mask = cache_entries - 1; |
| 145 | 148 | ||