ASoC: wm8994: Fix potential deadlock

[ Upstream commit 9529dc167ffcdfd201b9f0eda71015f174095f7e ]

Fix this by dropping wm8994->accdet_lock while calling
cancel_delayed_work_sync(&wm8994->mic_work) in wm1811_jackdet_irq().

Fixes: c0cc3f166525 ("ASoC: wm8994: Allow a delay between jack insertion and microphone detect")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221209091657.1183-1-m.szyprowski@samsung.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index f289762cd676ea9f044e913d6a22fe2ec683134f..1feeeed4bfb2812bc9df0e7f3cfc6bbf6aad74f7 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3704,7 +3704,12 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
        } else {
                dev_dbg(codec->dev, "Jack not detected\n");
 
+               /* Release wm8994->accdet_lock to avoid deadlock:
+                * cancel_delayed_work_sync() takes wm8994->mic_work internal
+                * lock and wm1811_mic_work takes wm8994->accdet_lock */
+               mutex_unlock(&wm8994->accdet_lock);
                cancel_delayed_work_sync(&wm8994->mic_work);
+               mutex_lock(&wm8994->accdet_lock);
 
                snd_soc_update_bits(codec, WM8958_MICBIAS2,
                                    WM8958_MICB2_DISCH, WM8958_MICB2_DISCH);