Unverified Commit 24de6356 authored Nov 11, 2019 by Bard liao Committed by Mark Brown Nov 12, 2019

ASoC: rt5682: cancel jack_detect_work if hs_jack is set to null



jack_detect_work will be triggered by rt5682_irq. We should cancel
it if hs_jack is set to null.

Signed-off-by: Bard liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191111222152.19723-1-pierre-louis.bossart@linux.intel.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent e7cfd867

sound/soc/codecs/rt5682.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1002,6 +1002,7 @@ static int rt5682_set_jack_detect(struct snd_soc_component *component,
		RT5682_JD1_EN_MASK, RT5682_JD1_DIS);
		regmap_update_bits(rt5682->regmap, RT5682_RC_CLK_CTRL,
		RT5682_POW_JDH \| RT5682_POW_JDL, 0);
		cancel_delayed_work_sync(&rt5682->jack_detect_work);
		return 0;
		}

Admin message