diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-17 12:40:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-17 12:40:07 -0400 |
| commit | 4705a81b2c1c1f3a31711f959cf87b4da7b2f06e (patch) | |
| tree | 7bc976300d7fde4bbcd5f284785c7a5751257576 | |
| parent | d2b923ef7b0e549dabcef0ca4605e2c0e4058216 (diff) | |
| parent | 7ca6759fa5cf97b1d822ec526d625d80482b8d6f (diff) | |
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
| -rw-r--r-- | drivers/base/regmap/regmap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 1c76dcb502cf..473f6743874c 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
| @@ -2582,10 +2582,7 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs, | |||
| 2582 | map->async = true; | 2582 | map->async = true; |
| 2583 | 2583 | ||
| 2584 | ret = _regmap_multi_reg_write(map, regs, num_regs); | 2584 | ret = _regmap_multi_reg_write(map, regs, num_regs); |
| 2585 | if (ret != 0) | ||
| 2586 | goto out; | ||
| 2587 | 2585 | ||
| 2588 | out: | ||
| 2589 | map->async = false; | 2586 | map->async = false; |
| 2590 | map->cache_bypass = bypass; | 2587 | map->cache_bypass = bypass; |
| 2591 | 2588 | ||