summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/rt700-sdw.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-09-22 00:37:14 +0300
committerMark Brown <broonie@kernel.org>2020-09-22 00:37:14 +0300
commit97ee967e6c56db6eb5ed5951276b9a6db04c6489 (patch)
tree9cc49cbcd56acd0a0b78be8788760550db02c421 /sound/soc/codecs/rt700-sdw.c
parent534c0f4391a497d10c2b5eb3df2016221b6ec4f6 (diff)
parentec96690de82cee2cb028c07b1e72cb4a446ad03a (diff)
downloadlinux-97ee967e6c56db6eb5ed5951276b9a6db04c6489.tar.xz
Merge branch 'asoc-5.9' into asoc-5.10
Diffstat (limited to 'sound/soc/codecs/rt700-sdw.c')
-rw-r--r--sound/soc/codecs/rt700-sdw.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
index ead4918bbf90..c7deb4e4fcf1 100644
--- a/sound/soc/codecs/rt700-sdw.c
+++ b/sound/soc/codecs/rt700-sdw.c
@@ -490,6 +490,9 @@ static int __maybe_unused rt700_dev_suspend(struct device *dev)
if (!rt700->hw_init)
return 0;
+ cancel_delayed_work_sync(&rt700->jack_detect_work);
+ cancel_delayed_work_sync(&rt700->jack_btn_check_work);
+
regcache_cache_only(rt700->regmap, true);
return 0;