path: root/drivers/base
diff options
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-09 18:03:25 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-09 18:03:25 +0100
commit51a246aa5c0a14b3d34a5c6d3c9e271c784b127f (patch)
treeda3de8af869c4262a0d983c4c20e5a3d9d31b1f5 /drivers/base
parent31880c37c11e28cb81c70757e38392b42e695dc6 (diff)
regmap: Back out work buffer fix
This reverts commit bc8ce4 (regmap: don't corrupt work buffer in _regmap_raw_write()) since it turns out that it can cause issues when taken in isolation from the other changes in -next that lead to its discovery. On the basis that nobody noticed the problems for quite some time without that subsequent work let's drop it from v3.9. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base')
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index d34adef1e63..58cfb323242 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -943,7 +943,8 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg,
unsigned int ival;
int val_bytes = map->format.val_bytes;
for (i = 0; i < val_len / val_bytes; i++) {
- ival = map->format.parse_val(val + (i * val_bytes));
+ memcpy(map->work_buf, val + (i * val_bytes), val_bytes);
+ ival = map->format.parse_val(map->work_buf);
ret = regcache_write(map, reg + (i * map->reg_stride),
if (ret) {