diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-10 16:49:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-10 16:50:18 -0400 |
| commit | 7ccda983931f64e9c89a9b16e6d4adeb92817d96 (patch) | |
| tree | db2cd5ff848812e148c9f254689cbc8fbafb5ea5 | |
| parent | affbe886e712437c25b575eac5fde5886bb42aec (diff) | |
| parent | 4174a7a4f763ed51809a4dbca06de054d31c1d38 (diff) | |
Merge remote-tracking branch 'regmap/fix/core' into regmap-async
| -rw-r--r-- | drivers/base/regmap/regmap.c | 8 |
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, | |||
| 1469 | */ | 1469 | */ |
| 1470 | if (map->use_single_rw) { | 1470 | if (map->use_single_rw) { |
| 1471 | for (i = 0; i < val_count; i++) { | 1471 | for (i = 0; i < val_count; i++) { |
| 1472 | ret = regmap_raw_write(map, | 1472 | ret = _regmap_raw_write(map, |
| 1473 | reg + (i * map->reg_stride), | 1473 | reg + (i * map->reg_stride), |
| 1474 | val + (i * val_bytes), | 1474 | val + (i * val_bytes), |
| 1475 | val_bytes); | 1475 | val_bytes); |
| 1476 | if (ret != 0) | 1476 | if (ret != 0) |
| 1477 | return ret; | 1477 | return ret; |
| 1478 | } | 1478 | } |