diff options
| author | Bard liao <yung-chuan.liao@linux.intel.com> | 2019-11-11 16:21:52 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-12 12:08:10 +0000 |
| commit | 24de63562b9da9fb3145329abb226ab623e6af19 (patch) | |
| tree | 37426a73e96f6f8481bc06a2fb6438d69ef664ef /sound/soc/codecs | |
| parent | e7cfd867fd9842f346688f28412eb83dec342900 (diff) | |
| download | linux-24de63562b9da9fb3145329abb226ab623e6af19.tar.bz2 | |
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>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/rt5682.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index c50b75ce82e0..62b8ed412bd1 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -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; } |