aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-02-01 16:09:14 -0500
committerMark Brown <broonie@kernel.org>2016-02-01 16:11:38 -0500
commitbb2bb45d1be28987e6cb50f50e4819795537ab83 (patch)
treefe74c7504043119b2f4f1ba67adf8d8ef224f220 /drivers/base
parent922a9f936e40001f9b921379aab90047d5990923 (diff)
regmap: Return an error if a caller attempts to do an unsupported raw read
regmaps without raw I/O access can't implement raw I/O operations, return an error if someone tries to do that rather than crashing. Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 343263449aff..e2f68807d970 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2255,6 +2255,9 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
2255 2255
2256 WARN_ON(!map->bus); 2256 WARN_ON(!map->bus);
2257 2257
2258 if (!map->bus || !map->bus->read)
2259 return -EINVAL;
2260
2258 range = _regmap_range_lookup(map, reg); 2261 range = _regmap_range_lookup(map, reg);
2259 if (range) { 2262 if (range) {
2260 ret = _regmap_select_page(map, &reg, range, 2263 ret = _regmap_select_page(map, &reg, range,