mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
regmap: Fix for v7.4
One fix for a real issue that fortunately doesn't affect any in tree configurations. -----BEGIN PGP SIGNATURE----- iHQEABYKAB0WIQReagvpf3TrrA7BoYYv73Ows9A4iQUCauTIrQAKCRAv73Ows9A4 iRrKAPdioxxMXzhqymnjt+qqFxZU+WEM1dI7wwN5ErfdgvJ/AQC90hBD/MfPflW1 L8vwD8jogi6VKRw8vYGEVQe/IAugAw== =yYQu -----END PGP SIGNATURE----- Merge tag 'regmap-fix-v7.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap Pull regmap fix from Mark Brown: "One fix for a real issue that fortunately doesn't affect any in tree configurations" * tag 'regmap-fix-v7.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: irq: fix incorrect index calculation for read_sub_irq_data()
This commit is contained in:
commit
a4395d81ec
|
|
@ -398,14 +398,14 @@ static int read_irq_data(struct regmap_irq_chip_data *data)
|
|||
|
||||
/* Read sub registers with active IRQs */
|
||||
for (i = 0; i < chip->num_main_regs; i++) {
|
||||
unsigned int b;
|
||||
unsigned int b, index;
|
||||
const unsigned long mreg = data->main_status_buf[i];
|
||||
|
||||
for_each_set_bit(b, &mreg, map->format.val_bytes * 8) {
|
||||
if (i * map->format.val_bytes * 8 + b >
|
||||
max_main_bits)
|
||||
index = i * map->format.val_bytes * 8 + b;
|
||||
if (index >= max_main_bits)
|
||||
break;
|
||||
ret = read_sub_irq_data(data, b);
|
||||
ret = read_sub_irq_data(data, index);
|
||||
|
||||
if (ret != 0) {
|
||||
dev_err(map->dev, "Failed to read IRQ status %d\n", ret);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user