Merge remote-tracking branch 'regmap/topic/range' into regmap-next

db00cb99 · Mark Brown · 3dedb61e · f161d220 · db00cb99
Commit db00cb99 authored Aug 31, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

drivers/base/regmap/regmap.c drivers/base/regmap/regmap.c +4 -0

No files found.
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -687,6 +687,10 @@ struct regmap *regmap_init(struct device *dev,
 			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,