diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-03 18:07:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-03 18:07:37 +0100 |
| commit | 59e618a6ceb79b81b2ed90fcb885f5f3fe2eec59 (patch) | |
| tree | 6309221ae78752b0850416243817f96e9f555f55 /drivers/base/regmap/regcache-rbtree.c | |
| parent | d683b96b072dc4680fc74964eca77e6a23d1fa6e (diff) | |
| parent | f3284f91535cc2e1406b7efe27a1de96c96c19b4 (diff) | |
Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus
Diffstat (limited to 'drivers/base/regmap/regcache-rbtree.c')
| -rw-r--r-- | drivers/base/regmap/regcache-rbtree.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index aa0875f6f1b7..02f490bad30f 100644 --- a/drivers/base/regmap/regcache-rbtree.c +++ b/drivers/base/regmap/regcache-rbtree.c @@ -143,7 +143,7 @@ static int rbtree_show(struct seq_file *s, void *ignored) int registers = 0; int this_registers, average; - map->lock(map); + map->lock(map->lock_arg); mem_size = sizeof(*rbtree_ctx); mem_size += BITS_TO_LONGS(map->cache_present_nbits) * sizeof(long); @@ -170,7 +170,7 @@ static int rbtree_show(struct seq_file *s, void *ignored) seq_printf(s, "%d nodes, %d registers, average %d registers, used %zu bytes\n", nodes, registers, average, mem_size); - map->unlock(map); + map->unlock(map->lock_arg); return 0; } @@ -391,8 +391,6 @@ static int regcache_rbtree_sync(struct regmap *map, unsigned int min, for (node = rb_first(&rbtree_ctx->root); node; node = rb_next(node)) { rbnode = rb_entry(node, struct regcache_rbtree_node, node); - if (rbnode->base_reg < min) - continue; if (rbnode->base_reg > max) break; if (rbnode->base_reg + rbnode->blklen < min) |