aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/rt711-sdw.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-09-21 22:37:14 +0100
committerMark Brown <broonie@kernel.org>2020-09-21 22:37:14 +0100
commit97ee967e6c56db6eb5ed5951276b9a6db04c6489 (patch)
tree9cc49cbcd56acd0a0b78be8788760550db02c421 /sound/soc/codecs/rt711-sdw.c
parentASoC: tas2562: Add the TAS2564 compatible (diff)
parentASoC: tlv320aic32x4: Enable fast charge (diff)
downloadlinux-dev-97ee967e6c56db6eb5ed5951276b9a6db04c6489.tar.xz
linux-dev-97ee967e6c56db6eb5ed5951276b9a6db04c6489.zip
Merge branch 'asoc-5.9' into asoc-5.10
Diffstat (limited to 'sound/soc/codecs/rt711-sdw.c')
-rw-r--r--sound/soc/codecs/rt711-sdw.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c
index 28d663673320..3a8ca600d1cf 100644
--- a/sound/soc/codecs/rt711-sdw.c
+++ b/sound/soc/codecs/rt711-sdw.c
@@ -491,6 +491,10 @@ static int __maybe_unused rt711_dev_suspend(struct device *dev)
if (!rt711->hw_init)
return 0;
+ cancel_delayed_work_sync(&rt711->jack_detect_work);
+ cancel_delayed_work_sync(&rt711->jack_btn_check_work);
+ cancel_work_sync(&rt711->calibration_work);
+
regcache_cache_only(rt711->regmap, true);
return 0;