aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/regmap/regmap.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-17 17:40:07 +0100
committerMark Brown <broonie@kernel.org>2015-06-17 17:40:07 +0100
commit4705a81b2c1c1f3a31711f959cf87b4da7b2f06e (patch)
tree7bc976300d7fde4bbcd5f284785c7a5751257576 /drivers/base/regmap/regmap.c
parentd2b923ef7b0e549dabcef0ca4605e2c0e4058216 (diff)
parent7ca6759fa5cf97b1d822ec526d625d80482b8d6f (diff)
downloadlinux-linaro-stable-4705a81b2c1c1f3a31711f959cf87b4da7b2f06e.tar.gz
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r--drivers/base/regmap/regmap.c3
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,
map->async = true;
ret = _regmap_multi_reg_write(map, regs, num_regs);
- if (ret != 0)
- goto out;
-out:
map->async = false;
map->cache_bypass = bypass;