Merge tag 'regmap-fix-v6.7-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / base / regmap / regmap.c

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 234a84ecde8b1b9c586102338daeb70101e58418..ea6157747199411452b064aab91ed8b4ca472f80 100644 (file)
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1620,17 +1620,19 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg,
        }
 
        if (!map->cache_bypass && map->format.parse_val) {
-               unsigned int ival;
+               unsigned int ival, offset;
                int val_bytes = map->format.val_bytes;
-               for (i = 0; i < val_len / val_bytes; i++) {
-                       ival = map->format.parse_val(val + (i * val_bytes));
-                       ret = regcache_write(map,
-                                            reg + regmap_get_offset(map, i),
-                                            ival);
+
+               /* Cache the last written value for noinc writes */
+               i = noinc ? val_len - val_bytes : 0;
+               for (; i < val_len; i += val_bytes) {
+                       ival = map->format.parse_val(val + i);
+                       offset = noinc ? 0 : regmap_get_offset(map, i / val_bytes);
+                       ret = regcache_write(map, reg + offset, ival);
                        if (ret) {
                                dev_err(map->dev,
                                        "Error in caching of register: %x ret: %d\n",
-                                       reg + regmap_get_offset(map, i), ret);
+                                       reg + offset, ret);
                                return ret;
                        }
                }