ASoC: cs35l41: Initialize completion object before requesting IRQ
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Thu, 7 Sep 2023 17:10:02 +0000 (20:10 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:59:17 +0000 (11:59 +0100)
[ Upstream commit 5ad668a9ce83d819701fb7abc1c2236049ec15c2 ]

Technically, an interrupt handler can be called before probe() finishes
its execution, hence ensure the pll_lock completion object is always
initialized before being accessed in cs35l41_irq().

Fixes: f5030564938b ("ALSA: cs35l41: Add shared boost feature")
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-4-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/cs35l41.c

index 722b69a6de26ca29d726a19b24ff21e2e2c57bed..fe5376b3e01b9a03287c8d3c4d7b96c76e25adc4 100644 (file)
@@ -1273,6 +1273,8 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
                regmap_update_bits(cs35l41->regmap, CS35L41_IRQ1_MASK3, CS35L41_INT3_PLL_LOCK_MASK,
                                   0 << CS35L41_INT3_PLL_LOCK_SHIFT);
 
+       init_completion(&cs35l41->pll_lock);
+
        ret = devm_request_threaded_irq(cs35l41->dev, cs35l41->irq, NULL, cs35l41_irq,
                                        IRQF_ONESHOT | IRQF_SHARED | irq_pol,
                                        "cs35l41", cs35l41);
@@ -1295,8 +1297,6 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
        if (ret < 0)
                goto err;
 
-       init_completion(&cs35l41->pll_lock);
-
        pm_runtime_set_autosuspend_delay(cs35l41->dev, 3000);
        pm_runtime_use_autosuspend(cs35l41->dev);
        pm_runtime_mark_last_busy(cs35l41->dev);