diff options
author | Mark Brown <broonie@kernel.org> | 2015-09-04 12:22:07 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-04 12:22:07 -0400 |
commit | f74741615368af1b8401be4b7a6f0b9ccbc2420a (patch) | |
tree | 2fa8ca4b843c405d4a89b48144f2eb661ac1420d | |
parent | b3959b5cd33383d9fa9b6c653e162331c2af2e08 (diff) | |
parent | 9a16ea900fadc88714e3a32214dea8e968ccd889 (diff) |
Merge remote-tracking branch 'regmap/fix/raw' into regmap-linus
-rw-r--r-- | drivers/base/regmap/regmap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 9b4badc2479d..c0aeda553c18 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
@@ -2184,6 +2184,11 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val, | |||
2184 | 2184 | ||
2185 | if (regmap_volatile_range(map, reg, val_count) || map->cache_bypass || | 2185 | if (regmap_volatile_range(map, reg, val_count) || map->cache_bypass || |
2186 | map->cache_type == REGCACHE_NONE) { | 2186 | map->cache_type == REGCACHE_NONE) { |
2187 | if (!map->bus->read) { | ||
2188 | ret = -ENOTSUPP; | ||
2189 | goto out; | ||
2190 | } | ||
2191 | |||
2187 | /* Physical block read if there's no cache involved */ | 2192 | /* Physical block read if there's no cache involved */ |
2188 | ret = _regmap_raw_read(map, reg, val, val_len); | 2193 | ret = _regmap_raw_read(map, reg, val, val_len); |
2189 | 2194 | ||