Commit 89a132ac authored Apr 11, 2013 by Linus Torvalds

regmap

Pull regmap revert from Mark Brown:
 "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."

* tag 'regmap-v3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Back out work buffer fix

parents ee8b890e 51a246aa

drivers/base/regmap/regmap.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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),
		ival);
		if (ret) {