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: c0cc3f1665
("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>
This commit is contained in:
Родитель
83f1b7f39a
Коммит
9529dc167f
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче