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

This commit is contained in:
Mark Brown 2013-10-28 13:01:32 -07:00
commit 70c1c86d56

View File

@ -1418,10 +1418,11 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
*/ */
if (map->use_single_rw) { if (map->use_single_rw) {
for (i = 0; i < val_count; i++) { for (i = 0; i < val_count; i++) {
ret = regmap_raw_write(map, ret = _regmap_raw_write(map,
reg + (i * map->reg_stride), reg + (i * map->reg_stride),
val + (i * val_bytes), val + (i * val_bytes),
val_bytes); val_bytes,
false);
if (ret != 0) if (ret != 0)
return ret; return ret;
} }