summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-01-28 17:57:41 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 12:51:52 -0700
commit36ed5d838510ccaf67a5b1f9b119a156ec2bf086 (patch)
treebe7dc1790b43abd340926817b81bf5310631ed4d /drivers/base
parent64cc92b3650cb5fcafbb868d45cf707f903ef4d6 (diff)
regmap-irq: do not write mask register if mask_base is zero
If client have not provided the mask base register then do not write into the mask register. (Cherrypicked commit 0705142a8736f2e2eae3af0e912feff4685a08e4) Reviewed-on: http://git-master/r/194662 Change-Id: Ic581de65277b2301d9105a235a3b65a935ba82dd Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/196741 GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap-irq.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 3f5b8915ff19..69454e37f966 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -80,6 +80,9 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
* suppress pointless writes.
*/
for (i = 0; i < d->chip->num_regs; i++) {
+ if (!d->chip->mask_base)
+ continue;
+
reg = d->chip->mask_base +
(i * map->reg_stride * d->irq_reg_stride);
if (d->chip->mask_invert)
@@ -471,6 +474,9 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
/* Mask all the interrupts by default */
for (i = 0; i < chip->num_regs; i++) {
d->mask_buf[i] = d->mask_buf_def[i];
+ if (!chip->mask_base)
+ continue;
+
reg = chip->mask_base +
(i * map->reg_stride * d->irq_reg_stride);
if (chip->mask_invert)