Commit f4e52e7ffdea791c89494752b175b991090f0920
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
Merge tag 'regmap-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull two more small regmap fixes from Mark Brown: - Now we have users for it that aren't running Android it turns out that regcache_sync_region() is much more useful to drivers if it's exported for use by modules. Who knew? - Make sure we don't divide by zero when doing debugfs dumps of rbtrees, not visible up until now because everything was providing at least some cache on startup. * tag 'regmap-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: prevent division by zero in rbtree_show regmap: Export regcache_sync_region()
Showing 2 changed files Side-by-side Diff
drivers/base/regmap/regcache-rbtree.c
| ... | ... | @@ -138,6 +138,7 @@ |
| 138 | 138 | unsigned int base, top; |
| 139 | 139 | int nodes = 0; |
| 140 | 140 | int registers = 0; |
| 141 | + int average; | |
| 141 | 142 | |
| 142 | 143 | mutex_lock(&map->lock); |
| 143 | 144 | |
| 144 | 145 | |
| ... | ... | @@ -152,8 +153,13 @@ |
| 152 | 153 | registers += top - base + 1; |
| 153 | 154 | } |
| 154 | 155 | |
| 156 | + if (nodes) | |
| 157 | + average = registers / nodes; | |
| 158 | + else | |
| 159 | + average = 0; | |
| 160 | + | |
| 155 | 161 | seq_printf(s, "%d nodes, %d registers, average %d registers\n", |
| 156 | - nodes, registers, registers / nodes); | |
| 162 | + nodes, registers, average); | |
| 157 | 163 | |
| 158 | 164 | mutex_unlock(&map->lock); |
| 159 | 165 |