diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-18 12:59:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-18 12:59:16 +0800 |
| commit | 667ea3959654ae48ef303df13f2635fd07766cb4 (patch) | |
| tree | 7f284b5ec16d010773a1101e02b0acb141ae40f4 /drivers/base | |
| parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (diff) | |
| parent | 6fb17a412207343151aac1fde91935a542339deb (diff) | |
Merge remote-tracking branch 'origin/v3.14/topic/overlayfs' into linux-linaro-lsk-v3.14
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regcache-rbtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index 930cad4e5df8..2b946bc4212d 100644 --- a/drivers/base/regmap/regcache-rbtree.c +++ b/drivers/base/regmap/regcache-rbtree.c @@ -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 */ |