diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-12-13 12:14:07 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-16 15:54:35 -0500 |
commit | 3b58ee13da7510115b66f71c67c9e87b47e9c4aa (patch) | |
tree | 96cadc0cf8c2152e53e92942ec32233696d28688 /drivers/base | |
parent | bd60e381fab88979c3312265d18bb635c314d242 (diff) |
regmap: Allow regmap_bulk_read() to work for "no-bus" regmaps
regmap_bulk_read() should decay to performing individual reads if
we're using a "no-bus" regmap. Unfortunately, it returns an
error because there is no map->bus pointer. Fix it.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/regmap/regmap.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 9a36ac14b0b5..02fa0e48b0f5 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
@@ -1897,14 +1897,10 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, | |||
1897 | size_t val_bytes = map->format.val_bytes; | 1897 | size_t val_bytes = map->format.val_bytes; |
1898 | bool vol = regmap_volatile_range(map, reg, val_count); | 1898 | bool vol = regmap_volatile_range(map, reg, val_count); |
1899 | 1899 | ||
1900 | if (!map->bus) | ||
1901 | return -EINVAL; | ||
1902 | if (!map->format.parse_inplace) | ||
1903 | return -EINVAL; | ||
1904 | if (reg % map->reg_stride) | 1900 | if (reg % map->reg_stride) |
1905 | return -EINVAL; | 1901 | return -EINVAL; |
1906 | 1902 | ||
1907 | if (vol || map->cache_type == REGCACHE_NONE) { | 1903 | if (map->bus && map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) { |
1908 | /* | 1904 | /* |
1909 | * Some devices does not support bulk read, for | 1905 | * Some devices does not support bulk read, for |
1910 | * them we have a series of single read operations. | 1906 | * them we have a series of single read operations. |