From: Jack Pham Date: Fri, 15 Apr 2016 06:37:26 +0000 (-0700) Subject: regmap: spmi: Fix regmap_spmi_ext_read in multi-byte case X-Git-Tag: v4.1.12-92~15^2~174 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fa2e818d92bfe03e716004be7bb69bd233b09ff6;p=users%2Fjedix%2Flinux-maple.git regmap: spmi: Fix regmap_spmi_ext_read in multi-byte case Orabug: 25227137 [ Upstream commit dec8e8f6e6504aa3496c0f7cc10c756bb0e10f44 ] 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 Signed-off-by: Mark Brown Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin (cherry picked from commit 24a50739c3e4e9947f4f4a28a023c348d7bea042) Signed-off-by: Dhaval Giani --- diff --git a/drivers/base/regmap/regmap-spmi.c b/drivers/base/regmap/regmap-spmi.c index d7026dc33388a..b394aaef38673 100644 --- a/drivers/base/regmap/regmap-spmi.c +++ b/drivers/base/regmap/regmap-spmi.c @@ -153,7 +153,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;