aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorCourtney Cavin <courtney.cavin@sonymobile.com>2013-11-20 15:27:09 -0800
committerMark Brown <broonie@linaro.org>2013-11-21 14:05:31 +0000
commit73f080fde50de1be7ab1e62fd93287edaf0861db (patch)
tree818cfcda72c6b88f42ddf7141bcbda78d4f97870 /drivers/base
parentMerge remote-tracking branch 'regmap/topic/spmi' into regmap-next (diff)
downloadlinux-dev-73f080fde50de1be7ab1e62fd93287edaf0861db.tar.xz
linux-dev-73f080fde50de1be7ab1e62fd93287edaf0861db.zip
regmap: make sure we unlock on failure in regmap_bulk_write
Signed-off-by: Courtney Cavin <courtney.cavin@sonymobile.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 9c021d9cace0..d1a914116f66 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1549,7 +1549,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
val + (i * val_bytes),
val_bytes);
if (ret != 0)
- return ret;
+ goto out;
}
} else {
ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);