summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Chandran <achandran@mvista.com>2015-06-15 15:59:02 +0530
committerZefan Li <lizefan@huawei.com>2015-10-22 09:20:04 +0800
commit2cd65577af5bb06910596361166f8eb1b5bbc491 (patch)
treeb8e1dcf943d13379f083ec56b28d14f18803d329
parentddae448fdcf3ae53104815c724300efa837bbacd (diff)
regmap: Fix regmap_bulk_read in BE mode
commit 15b8d2c41fe5839582029f65c5f7004db451cc2b upstream. In big endian mode regmap_bulk_read gives incorrect data for byte reads. This is because memcpy of a single byte from an address after full word read gives different results when endianness differs. ie. we get little-end in LE and big-end in BE. Signed-off-by: Arun Chandran <achandran@mvista.com> Signed-off-by: Mark Brown <broonie@kernel.org> [lizf: Backported to 3.4: format_val() takes only two arguments] Signed-off-by: Zefan Li <lizefan@huawei.com>
-rw-r--r--drivers/base/regmap/regmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 8e81f85b1ba0..0ac67aca7905 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -784,7 +784,7 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
ret = regmap_read(map, reg + i, &ival);
if (ret != 0)
return ret;
- memcpy(val + (i * val_bytes), &ival, val_bytes);
+ map->format.format_val(val + (i * val_bytes), ival);
}
}