Commit 8f14cf15 authored by Mark Zhang's avatar Mark Zhang Committed by Greg Kroah-Hartman

regmap-irq: do not write mask register if mask_base is zero

commit 7151449f upstream.

If client have not provided the mask base register then do not
write into the mask register.
Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarJinyoung Park <jinyoungp@nvidia.com>
Signed-off-by: default avatarVenkat Reddy Talla <vreddytalla@nvidia.com>
Signed-off-by: default avatarMark Zhang <markz@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 820b0107
...@@ -91,6 +91,9 @@ static void regmap_irq_sync_unlock(struct irq_data *data) ...@@ -91,6 +91,9 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
* suppress pointless writes. * suppress pointless writes.
*/ */
for (i = 0; i < d->chip->num_regs; i++) { for (i = 0; i < d->chip->num_regs; i++) {
if (!d->chip->mask_base)
continue;
reg = d->chip->mask_base + reg = d->chip->mask_base +
(i * map->reg_stride * d->irq_reg_stride); (i * map->reg_stride * d->irq_reg_stride);
if (d->chip->mask_invert) { if (d->chip->mask_invert) {
...@@ -526,6 +529,9 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, ...@@ -526,6 +529,9 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
/* Mask all the interrupts by default */ /* Mask all the interrupts by default */
for (i = 0; i < chip->num_regs; i++) { for (i = 0; i < chip->num_regs; i++) {
d->mask_buf[i] = d->mask_buf_def[i]; d->mask_buf[i] = d->mask_buf_def[i];
if (!chip->mask_base)
continue;
reg = chip->mask_base + reg = chip->mask_base +
(i * map->reg_stride * d->irq_reg_stride); (i * map->reg_stride * d->irq_reg_stride);
if (chip->mask_invert) if (chip->mask_invert)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment