diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-11-26 13:16:56 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-26 13:16:56 +0000 |
| commit | a46b6e72839d09fb6770e0c2357dde23e31036e1 (patch) | |
| tree | a4c5ce133d7c1321eeb1b6f4405c68e6d223844b /drivers/base | |
| parent | Linux 3.13-rc1 (diff) | |
| parent | regmap: make sure we unlock on failure in regmap_bulk_write (diff) | |
| download | linux-dev-a46b6e72839d09fb6770e0c2357dde23e31036e1.tar.xz linux-dev-a46b6e72839d09fb6770e0c2357dde23e31036e1.zip | |
Merge remote-tracking branch 'regmap/fix/core' into regmap-linus
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
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); |