diff options
author | Mark Brown <broonie@kernel.org> | 2018-02-26 12:00:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-02-26 12:00:14 +0100 |
commit | 2936e846c4e6df2df0dd6bcade3d269e17a707d1 (patch) | |
tree | 2982a223d634f68182d0e13b931c37d49cb4c470 /drivers/base/regmap | |
parent | regmap: Use _regmap_read in regmap_bulk_read (diff) | |
parent | regmap: Fix reversed bounds check in regmap_raw_write() (diff) | |
download | linux-2936e846c4e6df2df0dd6bcade3d269e17a707d1.tar.xz linux-2936e846c4e6df2df0dd6bcade3d269e17a707d1.zip |
Merge branch 'fix/core' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-bulk
Diffstat (limited to 'drivers/base/regmap')
-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 258a40e2a1d3..f5d653663626 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1831,7 +1831,7 @@ int regmap_raw_write(struct regmap *map, unsigned int reg, return -EINVAL; if (val_len % map->format.val_bytes) return -EINVAL; - if (map->max_raw_write && map->max_raw_write > val_len) + if (map->max_raw_write && map->max_raw_write < val_len) return -E2BIG; map->lock(map->lock_arg); |