aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/regmap/regmap.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-31 19:25:14 +0100
committerMark Brown <broonie@linaro.org>2013-08-31 19:25:14 +0100
commitdb00cb99438f33dad9a27b7a5527230d4fdcc138 (patch)
treeaca313f950c07e0745098bd4c779089018447e4f /drivers/base/regmap/regmap.c
parent3dedb61ec7a62ba669d07c604ebfa28598b569f2 (diff)
parentf161d22081e9b81f0b35411c428af347ca3dd449 (diff)
downloadlinux-linaro-stable-db00cb99438f33dad9a27b7a5527230d4fdcc138.tar.gz
Merge remote-tracking branch 'regmap/topic/range' into regmap-next
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r--drivers/base/regmap/regmap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index ff58f3847c06..aaf4e1372980 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -687,6 +687,10 @@ skip_format_initialization:
unsigned win_max = win_min +
config->ranges[j].window_len - 1;
+ /* Allow data window inside its own virtual range */
+ if (j == i)
+ continue;
+
if (range_cfg->range_min <= sel_reg &&
sel_reg <= range_cfg->range_max) {
dev_err(map->dev,