ASoC: mchp-spdifrx: disable end of block interrupt on failures

[ Upstream commit 05994d7cdf71d4213fbb42d85ee42ae214a6a36d ]

Disable end of block interrupt in case of wait for completion timeout
or errors to undo previously enable operation (done in
mchp_spdifrx_isr_blockend_en()). Otherwise we can end up with an
unbalanced reference counter for this interrupt.

Fixes: 5c8954cfbcfe ("ASoC: mchp-spdifrx: add driver for SPDIF RX")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220727090814.2446111-2-claudiu.beznea@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/atmel/mchp-spdifrx.c b/sound/soc/atmel/mchp-spdifrx.c
index bcd4f3e4fb0fbb16df66b31a82adc35c506f7ab9..2a62d9a2fa0d082e67b6ea543905716bff282471 100644 (file)
--- a/sound/soc/atmel/mchp-spdifrx.c
+++ b/sound/soc/atmel/mchp-spdifrx.c
@@ -288,15 +288,17 @@ static void mchp_spdifrx_isr_blockend_en(struct mchp_spdifrx_dev *dev)
        spin_unlock_irqrestore(&dev->blockend_lock, flags);
 }
 
-/* called from atomic context only */
+/* called from atomic/non-atomic context */
 static void mchp_spdifrx_isr_blockend_dis(struct mchp_spdifrx_dev *dev)
 {
-       spin_lock(&dev->blockend_lock);
+       unsigned long flags;
+
+       spin_lock_irqsave(&dev->blockend_lock, flags);
        dev->blockend_refcount--;
        /* don't enable BLOCKEND interrupt if it's already enabled */
        if (dev->blockend_refcount == 0)
                regmap_write(dev->regmap, SPDIFRX_IDR, SPDIFRX_IR_BLOCKEND);
-       spin_unlock(&dev->blockend_lock);
+       spin_unlock_irqrestore(&dev->blockend_lock, flags);
 }
 
 static irqreturn_t mchp_spdif_interrupt(int irq, void *dev_id)
@@ -575,6 +577,7 @@ static int mchp_spdifrx_subcode_ch_get(struct mchp_spdifrx_dev *dev,
        if (ret <= 0) {
                dev_dbg(dev->dev, "user data for channel %d timeout\n",
                        channel);
+               mchp_spdifrx_isr_blockend_dis(dev);
                return ret;
        }