ASoC: cs35l41: Verify PM runtime resume errors in IRQ handler

[ Upstream commit 9f8948db9849d202dee3570507d3a0642f92d632 ]

The interrupt handler invokes pm_runtime_get_sync() without checking the
returned error code.

Add a proper verification and switch to pm_runtime_resume_and_get(), to
avoid the need to call pm_runtime_put_noidle() for decrementing the PM
usage counter before returning from the error condition.

Fixes: f517ba4924ad ("ASoC: cs35l41: Add support for hibernate memory retention mode")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20230907171010.1447274-6-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c
index 2f4b0ee..e428898 100644 (file)
--- a/sound/soc/codecs/cs35l41.c
+++ b/sound/soc/codecs/cs35l41.c
@@ -374,10 +374,18 @@ static irqreturn_t cs35l41_irq(int irq, void *data)
        struct cs35l41_private *cs35l41 = data;
        unsigned int status[4] = { 0, 0, 0, 0 };
        unsigned int masks[4] = { 0, 0, 0, 0 };
-       int ret = IRQ_NONE;
        unsigned int i;
+       int ret;
 
-       pm_runtime_get_sync(cs35l41->dev);
+       ret = pm_runtime_resume_and_get(cs35l41->dev);
+       if (ret < 0) {
+               dev_err(cs35l41->dev,
+                       "pm_runtime_resume_and_get failed in %s: %d\n",
+                       __func__, ret);
+               return IRQ_NONE;
+       }
+
+       ret = IRQ_NONE;
 
        for (i = 0; i < ARRAY_SIZE(status); i++) {
                regmap_read(cs35l41->regmap,