regmap: fix bulk writes on paged registers
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Wed, 12 Jun 2019 11:03:43 +0000 (12:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Jul 2019 05:28:25 +0000 (07:28 +0200)
[ Upstream commit db057679de3e9e6a03c1bcd5aee09b0d25fd9f5b ]

On buses like SlimBus and SoundWire which does not support
gather_writes yet in regmap, A bulk write on paged register
would be silently ignored after programming page.
This is because local variable 'ret' value in regmap_raw_write_impl()
gets reset to 0 once page register is written successfully and the
code below checks for 'ret' value to be -ENOTSUPP before linearising
the write buffer to send to bus->write().

Fix this by resetting the 'ret' value to -ENOTSUPP in cases where
gather_writes() is not supported or single register write is
not possible.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/base/regmap/regmap.c

index 8fd08023c0f5fae351800ab27d30a8a244eabaaa..013d0a2b3ba0ae7deea7c95ba2704bdfbdae844d 100644 (file)
@@ -1509,6 +1509,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
                                             map->format.reg_bytes +
                                             map->format.pad_bytes,
                                             val, val_len);
+       else
+               ret = -ENOTSUPP;
 
        /* If that didn't work fall back on linearising by hand. */
        if (ret == -ENOTSUPP) {