diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-26 08:16:56 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-26 08:16:56 -0500 |
| commit | a46b6e72839d09fb6770e0c2357dde23e31036e1 (patch) | |
| tree | a4c5ce133d7c1321eeb1b6f4405c68e6d223844b /drivers/base | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
| parent | 73f080fde50de1be7ab1e62fd93287edaf0861db (diff) | |
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, | |||
| 1549 | val + (i * val_bytes), | 1549 | val + (i * val_bytes), |
| 1550 | val_bytes); | 1550 | val_bytes); |
| 1551 | if (ret != 0) | 1551 | if (ret != 0) |
| 1552 | return ret; | 1552 | goto out; |
| 1553 | } | 1553 | } |
| 1554 | } else { | 1554 | } else { |
| 1555 | ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count); | 1555 | ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count); |