aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/regmap/regmap.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-10 21:49:37 +0100
committerMark Brown <broonie@linaro.org>2013-10-10 21:50:18 +0100
commit7ccda983931f64e9c89a9b16e6d4adeb92817d96 (patch)
treedb2cd5ff848812e148c9f254689cbc8fbafb5ea5 /drivers/base/regmap/regmap.c
parentaffbe886e712437c25b575eac5fde5886bb42aec (diff)
parent4174a7a4f763ed51809a4dbca06de054d31c1d38 (diff)
downloadlinux-linaro-stable-7ccda983931f64e9c89a9b16e6d4adeb92817d96.tar.gz
Merge remote-tracking branch 'regmap/fix/core' into regmap-async
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r--drivers/base/regmap/regmap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 71282e12fd29..a975a601f718 100644
--- 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;
}