diff options
| author |   Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
| commit | 2927e6d398d0fca52d8f011a89dcfcabb2b1abfd (patch) | |
| tree | 30ddd4cddded855db423c290512d7be7c13dc9db /sound/soc/codecs/rt711-sdw.c | |
| parent | Merge series "ASoC: mediatek: mt8192: apply some cleanup" from Tzung-Bi Shih <tzungbi@google.com>: (diff) | |
| parent | Merge series "ASoC: SOF/Intel/SoundWire: add missing quirks and DMIC support" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: (diff) | |
| download | linux-dev-2927e6d398d0fca52d8f011a89dcfcabb2b1abfd.tar.xz linux-dev-2927e6d398d0fca52d8f011a89dcfcabb2b1abfd.zip | |
Merge branch 'asoc-5.11' into asoc-5.12
Diffstat (limited to 'sound/soc/codecs/rt711-sdw.c')
| -rw-r--r-- | sound/soc/codecs/rt711-sdw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c index 756c0ada3b31..2beb4286d997 100644 --- a/sound/soc/codecs/rt711-sdw.c +++ b/sound/soc/codecs/rt711-sdw.c @@ -463,8 +463,8 @@ static int rt711_sdw_remove(struct sdw_slave *slave) struct rt711_priv *rt711 = dev_get_drvdata(&slave->dev); if (rt711 && rt711->hw_init) { - cancel_delayed_work(&rt711->jack_detect_work); - cancel_delayed_work(&rt711->jack_btn_check_work); + cancel_delayed_work_sync(&rt711->jack_detect_work); + cancel_delayed_work_sync(&rt711->jack_btn_check_work); cancel_work_sync(&rt711->calibration_work); } |