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

2013-10-10 21:49:37 +01:00 · 2013-10-10 21:49:37 +01:00 · 7ccda98393
parent affbe886e7 4174a7a4f7
commit 7ccda98393
1 changed files with 4 additions and 4 deletions
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@ -1469,10 +1469,10 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
 	 */
 	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);
 			if (ret != 0)
 				return ret;
 		}