ASoC: rt5682-sdw: cancel_work_sync() in .remove and .suspend

Follow pattern from other drivers and use cancel_work_sync() for both
.remove() and .suspend().

Fixes: 03f6fc6de919 ('ASoC: rt5682: Add the soundwire support')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Link: https://lore.kernel.org/r/20210204201739.25206-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c
index 4d707e8..35c9d2b 100644 (file)
--- a/sound/soc/codecs/rt5682-sdw.c
+++ b/sound/soc/codecs/rt5682-sdw.c
@@ -703,7 +703,7 @@ static int rt5682_sdw_remove(struct sdw_slave *slave)
        struct rt5682_priv *rt5682 = dev_get_drvdata(&slave->dev);
 
        if (rt5682 && rt5682->hw_init)
-               cancel_delayed_work(&rt5682->jack_detect_work);
+               cancel_delayed_work_sync(&rt5682->jack_detect_work);
 
        return 0;
 }
@@ -721,6 +721,8 @@ static int __maybe_unused rt5682_dev_suspend(struct device *dev)
        if (!rt5682->hw_init)
                return 0;
 
+       cancel_delayed_work_sync(&rt5682->jack_detect_work);
+
        regcache_cache_only(rt5682->regmap, true);
        regcache_mark_dirty(rt5682->regmap);