]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
regmap: regcache-rbtree: Fix present bitmap resize
authorLars-Peter Clausen <lars@metafoo.de>
Sat, 7 Mar 2015 16:10:01 +0000 (17:10 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 9 Apr 2015 12:14:04 +0000 (14:14 +0200)
commit 328f494d95aac8bd4896aea2328bc281053bcb71 upstream.

When inserting a new register into a block at the lower end the present
bitmap is currently shifted into the wrong direction. The effect of this is
that the bitmap becomes corrupted and registers which are present might be
reported as not present and vice versa.

Fix this by shifting left rather than right.

Fixes: 472fdec7380c("regmap: rbtree: Reduce number of nodes, take 2")
Reported-by: Daniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/base/regmap/regcache-rbtree.c

index 930cad4e5df8a10d7af43c42e2b3d0ebee3bf121..2b946bc4212dfb346ab521334277dafc162d7ad2 100644 (file)
@@ -313,7 +313,7 @@ static int regcache_rbtree_insert_to_block(struct regmap *map,
        if (pos == 0) {
                memmove(blk + offset * map->cache_word_size,
                        blk, rbnode->blklen * map->cache_word_size);
-               bitmap_shift_right(present, present, offset, blklen);
+               bitmap_shift_left(present, present, offset, blklen);
        }
 
        /* update the rbnode block, its size and the base register */