diff options
| author | Mark Zhang | 2019-01-14 10:32:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-21 09:03:16 +0200 |
| commit | 8f14cf159e9ffe45fe9b66d05a13231f0ed2b43e (patch) | |
| tree | 10c702729a469ebe118e50c95e2f60efa5f3c41f | |
| parent | crypto/NX: Set receive window credits to max number of CRBs in RxFIFO (diff) | |
| download | kernel-qcow2-linux-8f14cf159e9ffe45fe9b66d05a13231f0ed2b43e.tar.gz kernel-qcow2-linux-8f14cf159e9ffe45fe9b66d05a13231f0ed2b43e.tar.xz kernel-qcow2-linux-8f14cf159e9ffe45fe9b66d05a13231f0ed2b43e.zip | |
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>
| -rw-r--r-- | drivers/base/regmap/regmap-irq.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index 429ca8ed7e51..982c7ac311b8 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c @@ -91,6 +91,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) { @@ -526,6 +529,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) |