diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-10 22:49:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-10 22:50:18 +0200 |
| commit | 7ccda983931f64e9c89a9b16e6d4adeb92817d96 (patch) | |
| tree | db2cd5ff848812e148c9f254689cbc8fbafb5ea5 /drivers/base/regmap | |
| parent | regmap: Use async I/O during cache sync (diff) | |
| parent | regmap: Fix regmap_bulk_write single-rw mutex deadlock (diff) | |
| download | linux-7ccda983931f64e9c89a9b16e6d4adeb92817d96.tar.xz linux-7ccda983931f64e9c89a9b16e6d4adeb92817d96.zip | |
Merge remote-tracking branch 'regmap/fix/core' into regmap-async
Diffstat (limited to 'drivers/base/regmap')
| -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, */ 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; } |