regmap: Check stride of register patch as we register it

Currently, we check the registers in the patch are aligned to the
register stride everytime we sync the cache and the first time the patch
is written out is unchecked.

This patch checks the register patch when we first register it so the
first writes are no longer unchecked and then doesn't check on
subsequent syncs as the patch will be unchanged.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index d4dd77134814..16426aa1457c 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -312,10 +312,6 @@ int regcache_sync(struct regmap *map)
         /* Apply any patch first */
         map->cache_bypass = 1;
         for (i = 0; i < map->patch_regs; i++) {
-                if (map->patch[i].reg % map->reg_stride) {
-                        ret = -EINVAL;
-                        goto out;
-                }
                 ret = _regmap_write(map, map->patch[i].reg, map->patch[i].def);
                 if (ret != 0) {
                         dev_err(map->dev, "Failed to write %x = %x: %d\n",
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 6a19515f8a45..6e19560c7a5b 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2194,6 +2194,10 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 
         /* Write out first; it's useful to apply even if we fail later. */
         for (i = 0; i < num_regs; i++) {
+                if (regs[i].reg % map->reg_stride) {
+                        ret = -EINVAL;
+                        goto out;
+                }
                 ret = _regmap_write(map, regs[i].reg, regs[i].def);
                 if (ret != 0) {
                         dev_err(map->dev, "Failed to write %x = %x: %d\n",