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

7ccda983 · Mark Brown · affbe886 · 4174a7a4 · 7ccda983
Commit 7ccda983 authored Oct 10, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

drivers/base/regmap/regmap.c drivers/base/regmap/regmap.c +4 -4

No files found.
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1469,7 +1469,7 @@ 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,
+			ret = _regmap_raw_write(map,
 						reg + (i * map->reg_stride),
 						val + (i * val_bytes),
 						val_bytes);