summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Pham <jackp@codeaurora.org>2016-04-14 23:37:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-18 18:35:11 -0700
commitd764263450e64f2dddb07afda47c54238fdc491d (patch)
treed7ccdcab82cef1651069c8cb76f7d29eebdaecc2
parent7ac50df1487deaa39b2b19d7c205fe49d2ef132b (diff)
downloadlwn-d764263450e64f2dddb07afda47c54238fdc491d.tar.gz
lwn-d764263450e64f2dddb07afda47c54238fdc491d.zip
regmap: spmi: Fix regmap_spmi_ext_read in multi-byte case
commit dec8e8f6e6504aa3496c0f7cc10c756bb0e10f44 upstream. Specifically for the case of reads that use the Extended Register Read Long command, a multi-byte read operation is broken up into 8-byte chunks. However the call to spmi_ext_register_readl() is incorrectly passing 'val_size', which if greater than 8 will always fail. The argument should instead be 'len'. Fixes: c9afbb05a9ff ("regmap: spmi: support base and extended register spaces") Signed-off-by: Jack Pham <jackp@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/base/regmap/regmap-spmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-spmi.c b/drivers/base/regmap/regmap-spmi.c
index 7e58f6560399..4a36e415e938 100644
--- a/drivers/base/regmap/regmap-spmi.c
+++ b/drivers/base/regmap/regmap-spmi.c
@@ -142,7 +142,7 @@ static int regmap_spmi_ext_read(void *context,
while (val_size) {
len = min_t(size_t, val_size, 8);
- err = spmi_ext_register_readl(context, addr, val, val_size);
+ err = spmi_ext_register_readl(context, addr, val, len);
if (err)
goto err_out;