[PATCH] regmap-irq: Fix bug in regmap_irq_get_irq_reg_linear()

[PATCH] regmap-irq: Fix bug in regmap_irq_get_irq_reg_linear()

[Aidan MacDonald]

irq_reg_stride in struct regmap_irq_chip is often 0, but that
actually means to use the default stride of 1. The effective
stride is stored in struct regmap_irq_chip_data->irq_reg_stride
and will get the corrected default value.

The default ->get_irq_reg() callback was using the stride from
the chip definition, which is wrong; fix it to use the effective
stride from the chip data instead.

Link: https://lore.kernel.org/lkml/acaaf77f-3282-8544-dd3c-7915fc1a6a4f@samsung.com/
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
---
 drivers/base/regmap/regmap-irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index a691553a0d6f..4ef9488d05cd 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -636,7 +636,7 @@ unsigned int regmap_irq_get_irq_reg_linear(struct regmap_irq_chip_data *data,
 		return base + subreg->offset[0];
 	}
 
-	return base + index * map->reg_stride * chip->irq_reg_stride;
+	return base + index * map->reg_stride * data->irq_reg_stride;
 }
 EXPORT_SYMBOL_GPL(regmap_irq_get_irq_reg_linear);
 
-- 
2.35.1

Re: [PATCH] regmap-irq: Fix bug in regmap_irq_get_irq_reg_linear()

[Mark Brown]

On Mon, 4 Jul 2022 12:28:47 +0100, Aidan MacDonald wrote:
> irq_reg_stride in struct regmap_irq_chip is often 0, but that
> actually means to use the default stride of 1. The effective
> stride is stored in struct regmap_irq_chip_data->irq_reg_stride
> and will get the corrected default value.
> 
> The default ->get_irq_reg() callback was using the stride from
> the chip definition, which is wrong; fix it to use the effective
> stride from the chip data instead.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next

Thanks!

[1/1] regmap-irq: Fix bug in regmap_irq_get_irq_reg_linear()
      commit: 773d09b4c3acafd35f8b6e90848a39cedc03c52b

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark