regmap-irq: Fix bug in regmap_irq_get_irq_reg_linear()
authorAidan MacDonald <aidanmacdonald.0x0@gmail.com>
Mon, 4 Jul 2022 11:28:47 +0000 (12:28 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 5 Jul 2022 12:00:55 +0000 (13:00 +0100)
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>
Link: https://lore.kernel.org/r/20220704112847.23844-1-aidanmacdonald.0x0@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/base/regmap/regmap-irq.c

index a691553a0d6f3e40030fef2b63d14fcd62e41acc..4ef9488d05cde46a5d7165c9081f75ac44c51070 100644 (file)
@@ -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);