path: root/drivers/base/regmap/regmap.c
diff options
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2014-02-21 19:37:10 +0000
committerMark Brown <broonie@linaro.org>2014-02-22 11:15:13 +0900
commit7a7a70b49b51e90593ae072a9402d6615d05e895 (patch)
tree3e229b0b29e46555c9a924450f811bd497c0e3ac /drivers/base/regmap/regmap.c
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
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>
Diffstat (limited to 'drivers/base/regmap/regmap.c')
1 files changed, 4 insertions, 0 deletions
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",