Unverified Commit 121871a7 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: rt711-sdw: use cancel_work_sync() for .remove 



Make sure the workqueues are not running after the .remove() callback,
which can lead to timeout errors.

A previous fix to use cancel_work_sync was applied for the suspend
case but the remove case is missing

Fixes: 501ef013 ('ASoC: rt711: wait for the delayed work to finish when the system suspends')
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@linux.intel.com>
Link: https://lore.kernel.org/r/20210204201739.25206-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 737ee8bd

sound/soc/codecs/rt711-sdw.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}