diff options
| author | Derek Fang <derek.fang@realtek.com> | 2022-02-23 11:14:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-02-24 03:04:33 +0100 |
| commit | c07ac3ee76e5e5506bca9c03fbbb15e40ab28430 (patch) | |
| tree | 57227e9a52a87d9561c3feb74d18115b79e73be2 /sound/soc/codecs/rt5682s.h | |
| parent | ASoC: Intel: soc-acpi-byt: Add new WM5102 ACPI HID (diff) | |
| download | linux-c07ac3ee76e5e5506bca9c03fbbb15e40ab28430.tar.xz linux-c07ac3ee76e5e5506bca9c03fbbb15e40ab28430.zip | |
ASoC: rt5682s: Fix the wrong jack type detected
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.
We refer to the below commit of the variant codec (rt5682) to fix
this issue.
ASoC: rt5682: Fix deadlock on resume
1. Remove rt5682s_headset_detect in rt5682s_jd_check_handler and
use jack_detect_work instead of.
2. Use dapm mutex used in CCF to protect most of jack_detect_work.
Signed-off-by: Derek Fang <derek.fang@realtek.com>
Link: https://lore.kernel.org/r/20220223101450.4577-1-derek.fang@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt5682s.h')
| -rw-r--r-- | sound/soc/codecs/rt5682s.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5682s.h b/sound/soc/codecs/rt5682s.h index 1bf2ef7ce578..397a2531b6f6 100644 --- a/sound/soc/codecs/rt5682s.h +++ b/sound/soc/codecs/rt5682s.h @@ -1446,7 +1446,6 @@ struct rt5682s_priv { struct delayed_work jd_check_work; struct mutex calibrate_mutex; struct mutex sar_mutex; - struct mutex jdet_mutex; #ifdef CONFIG_COMMON_CLK struct clk_hw dai_clks_hw[RT5682S_DAI_NUM_CLKS]; |