summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2022-12-09 10:16:57 +0100
committerMark Brown <broonie@kernel.org>2022-12-12 15:44:24 +0000
commit9529dc167ffcdfd201b9f0eda71015f174095f7e (patch)
treefa8de097e0eeae04be1218e52133746a951a3bc8 /sound
parent83f1b7f39af73b01edf098fe3141404670703281 (diff)
downloadlwn-9529dc167ffcdfd201b9f0eda71015f174095f7e.tar.gz
lwn-9529dc167ffcdfd201b9f0eda71015f174095f7e.zip
ASoC: wm8994: Fix potential deadlock
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index d3cfd3788f2a..8fe9a75d1235 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3853,7 +3853,12 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
} else {
dev_dbg(component->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_component_update_bits(component, WM8958_MICBIAS2,
WM8958_MICB2_DISCH, WM8958_MICB2_DISCH);