aboutsummaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorGravatar Aidan MacDonald <aidanmacdonald.0x0@gmail.com> 2022-07-04 12:28:47 +0100
committerGravatar Mark Brown <broonie@kernel.org> 2022-07-05 13:00:55 +0100
commit773d09b4c3acafd35f8b6e90848a39cedc03c52b (patch)
treebca3b53fa4a2ec02100a6cde4cf554dced8cd54c /drivers/base
parentregmap-irq cleanups and refactoring (diff)
downloadlinux-773d09b4c3acafd35f8b6e90848a39cedc03c52b.tar.gz
linux-773d09b4c3acafd35f8b6e90848a39cedc03c52b.tar.bz2
linux-773d09b4c3acafd35f8b6e90848a39cedc03c52b.zip
regmap-irq: Fix bug in regmap_irq_get_irq_reg_linear()
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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap-irq.c2
1 files changed, 1 insertions, 1 deletions
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);