[PATCH 5.10 69/76] ASoC: rt5682: fix the wrong jack type detected
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2021-12-27 15:41:57
Also in:
lkml
From: Derek Fang <redacted> commit 8deb34a90f06374fd26f722c2a79e15160f66be7 upstream. Some powers were changed during the jack insert detection and clk's enable/disable in CCF. If in parallel, the influence has a chance to detect the wrong jack type, so add a lock. Signed-off-by: Derek Fang <redacted> Link: https://lore.kernel.org/r/20211214105033.471-1-derek.fang@realtek.com (local) Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- sound/soc/codecs/rt5682.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c@@ -924,6 +924,8 @@ int rt5682_headset_detect(struct snd_soc unsigned int val, count; if (jack_insert) { + snd_soc_dapm_mutex_lock(dapm); + snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1, RT5682_PWR_VREF2 | RT5682_PWR_MB, RT5682_PWR_VREF2 | RT5682_PWR_MB);
@@ -968,6 +970,8 @@ int rt5682_headset_detect(struct snd_soc snd_soc_component_update_bits(component, RT5682_MICBIAS_2, RT5682_PWR_CLK25M_MASK | RT5682_PWR_CLK1M_MASK, RT5682_PWR_CLK25M_PU | RT5682_PWR_CLK1M_PU); + + snd_soc_dapm_mutex_unlock(dapm); } else { rt5682_enable_push_button_irq(component, false); snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1,