aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/base/regmap/regcache.c4
-rw-r--r--drivers/base/regmap/regmap.c4
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)
312 /* Apply any patch first */ 312 /* Apply any patch first */
313 map->cache_bypass = 1; 313 map->cache_bypass = 1;
314 for (i = 0; i < map->patch_regs; i++) { 314 for (i = 0; i < map->patch_regs; i++) {
315 if (map->patch[i].reg % map->reg_stride) {
316 ret = -EINVAL;
317 goto out;
318 }
319 ret = _regmap_write(map, map->patch[i].reg, map->patch[i].def); 315 ret = _regmap_write(map, map->patch[i].reg, map->patch[i].def);
320 if (ret != 0) { 316 if (ret != 0) {
321 dev_err(map->dev, "Failed to write %x = %x: %d\n", 317 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,
2194 2194
2195 /* Write out first; it's useful to apply even if we fail later. */ 2195 /* Write out first; it's useful to apply even if we fail later. */
2196 for (i = 0; i < num_regs; i++) { 2196 for (i = 0; i < num_regs; i++) {
2197 if (regs[i].reg % map->reg_stride) {
2198 ret = -EINVAL;
2199 goto out;
2200 }
2197 ret = _regmap_write(map, regs[i].reg, regs[i].def); 2201 ret = _regmap_write(map, regs[i].reg, regs[i].def);
2198 if (ret != 0) { 2202 if (ret != 0) {
2199 dev_err(map->dev, "Failed to write %x = %x: %d\n", 2203 dev_err(map->dev, "Failed to write %x = %x: %d\n",