diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-29 13:32:36 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-29 13:32:36 +0100 |
commit | 65c180fd95993abc31c8770e014ebedade46b623 (patch) | |
tree | 90052dbe66ac706e8689f321bcfa5cc21ccd70e0 /drivers/base/regmap/regmap.c | |
parent | regcache-rbtree: Fix reg_stride != 1 (diff) | |
parent | regmap: regcache: allow read-only regs to be cached (diff) | |
download | linux-dev-65c180fd95993abc31c8770e014ebedade46b623.tar.xz linux-dev-65c180fd95993abc31c8770e014ebedade46b623.zip |
Merge remote-tracking branch 'regmap/topic/cache' into regmap-rbtree
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r-- | drivers/base/regmap/regmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index e0d0c7d8a5c5..0e85367e504d 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1261,6 +1261,9 @@ int _regmap_write(struct regmap *map, unsigned int reg, int ret; void *context = _regmap_map_get_context(map); + if (!regmap_writeable(map, reg)) + return -EIO; + if (!map->cache_bypass && !map->defer_caching) { ret = regcache_write(map, reg, val); if (ret != 0) |