diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-10-28 13:01:32 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-28 13:01:32 -0700 |
| commit | 70c1c86d56522fd1dffb9c17df4cbec3c2e1ac60 (patch) | |
| tree | 7298916087f65e21a5cfab286238141f91f46cea /drivers/base | |
| parent | Linux 3.12-rc7 (diff) | |
| parent | regmap: Fix regmap_bulk_write single-rw mutex deadlock (diff) | |
| download | linux-dev-70c1c86d56522fd1dffb9c17df4cbec3c2e1ac60.tar.xz linux-dev-70c1c86d56522fd1dffb9c17df4cbec3c2e1ac60.zip | |
Merge remote-tracking branch 'regmap/fix/core' into regmap-linus
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 7d689a15c500..c1245cae0f43 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1418,10 +1418,11 @@ 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, + false); if (ret != 0) return ret; } |