diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-21 18:54:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-21 18:54:34 +0000 |
| commit | efbf0c1bc8f2d3496219d52c20a6ad7149a04443 (patch) | |
| tree | 3cd85ba0dda258aa1ab8f142de82c46ca6751f67 /drivers/base | |
| parent | a0cee48898708dd3074492edf369fd4c5aecb6c3 (diff) | |
| parent | 2dc2565902d3c24108c4b7101e91957fd068a242 (diff) | |
Merge tag 'v3.14.25' into linux-linaro-lsk-v3.14
This is the 3.14.25 stable release
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index f6cff3be0ed7..2f9a3d8ecbbf 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1557,8 +1557,10 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, } else { void *wval; - if (!val_count) - return -EINVAL; + if (!val_count) { + ret = -EINVAL; + goto out; + } wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL); if (!wval) { |