ASoC: rt5682: cancel jack_detect_work if hs_jack is set to null
diff mbox series

Message ID 20191111222152.19723-1-pierre-louis.bossart@linux.intel.com
State Accepted
Commit 24de63562b9da9fb3145329abb226ab623e6af19
Headers show
Series
  • ASoC: rt5682: cancel jack_detect_work if hs_jack is set to null
Related show

Commit Message

Pierre-Louis Bossart Nov. 11, 2019, 10:21 p.m. UTC
From: Bard liao <yung-chuan.liao@linux.intel.com>

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>
---
 sound/soc/codecs/rt5682.c | 1 +
 1 file changed, 1 insertion(+)

Patch
diff mbox series

diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index 35dcec135c8a..0d8e9866c01a 100644
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -1003,6 +1003,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;
 	}