From: Mark Brown <broonie@linaro.org>
Date: Thu, 10 Oct 2013 20:49:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'regmap/fix/core' into regmap-async
X-Git-Tag: v3.13-rc1~125^2~6^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ccda983931f64e9c89a9b16e6d4adeb92817d96;p=thirdparty%2Fkernel%2Flinux.git

Merge remote-tracking branch 'regmap/fix/core' into regmap-async
---

7ccda983931f64e9c89a9b16e6d4adeb92817d96
diff --cc drivers/base/regmap/regmap.c
index 71282e12fd294,c1245cae0f438..a975a601f718a
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -1469,10 -1418,11 +1469,10 @@@ int regmap_bulk_write(struct regmap *ma
  	 */
  	if (map->use_single_rw) {
  		for (i = 0; i < val_count; i++) {
- 			ret = regmap_raw_write(map,
- 					       reg + (i * map->reg_stride),
- 					       val + (i * val_bytes),
- 					       val_bytes);
+ 			ret = _regmap_raw_write(map,
+ 						reg + (i * map->reg_stride),
+ 						val + (i * val_bytes),
 -						val_bytes,
 -						false);
++						val_bytes);
  			if (ret != 0)
  				return ret;
  		}