| From: Charles Keepax <ckeepax@opensource.cirrus.com> |
| Date: Mon, 12 Feb 2018 18:15:45 +0000 |
| Subject: regmap: Correct offset handling in regmap_volatile_range |
| |
| commit b8f9a03b741ddfdde4aa8b607fa7d88eb63a6338 upstream. |
| |
| The current implementation is broken for regmaps that have a reg_stride, |
| since it doesn't take the stride into account. Correct this by using the |
| helper function to calculate the register offset. |
| |
| Fixes: f01ee60fffa4 ("regmap: implement register striding") |
| Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| [bwh: Backported to 3.16: Use simple multiplication instead of |
| regmap_get_offset()] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/base/regmap/regmap.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/base/regmap/regmap.c |
| +++ b/drivers/base/regmap/regmap.c |
| @@ -144,7 +144,7 @@ static bool regmap_volatile_range(struct |
| unsigned int i; |
| |
| for (i = 0; i < num; i++) |
| - if (!regmap_volatile(map, reg + i)) |
| + if (!regmap_volatile(map, reg + (i * map->reg_stride))) |
| return false; |
| |
| return true; |
