Browse Source

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

commit 7151449fe7fa5962c6153355f9779d6be99e8e97 upstream.

If client have not provided the mask base register then do not
write into the mask register.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Jinyoung Park <jinyoungp@nvidia.com>
Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com>
Signed-off-by: Mark Zhang <markz@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Mark Zhang 7 years ago
parent
commit
8f14cf159e
1 changed files with 6 additions and 0 deletions
  1. 6 0
      drivers/base/regmap/regmap-irq.c

+ 6 - 0
drivers/base/regmap/regmap-irq.c

@@ -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,
 	/* 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)