github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-10 17:11:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: rt-sdw: always cancel jack work on remove

Browse Source 
Jiale Yao <yaojiale02@163.com> says:

The Realtek SoundWire codec remove callbacks cancel jack work only while
hw_init is true. hw_init is cleared by update_status() when the slave
becomes unattached, but jack work can already have been queued by the
interrupt callback or jack initialization path. If remove runs after that
state transition, the pending work is not drained and can run after the
codec private data has been freed.

The same lifecycle problem can be triggered in each codec:
  1. init queues jack work;
  2. update_status(UNATTACHED) clears hw_init;
  3. remove sees hw_init false and skips the cancel;
  4. the work runs after private data teardown.

Each codec initializes its work objects during probe, so the remove paths
can cancel them unconditionally and pair the work lifetime with the codec
private data lifetime instead of the mutable hw_init state.

The series fixes rt5682-sdw, rt711-sdw, rt711-sdca-sdw, rt712-sdca-sdw,
rt721-sdca-sdw and rt722-sdca-sdw. Each patch is independent and applies
to the same baseline.

Link: https://patch.msgid.link/20260925145019.2290367-1-yaojiale02@163.com
This commit is contained in:
Mark Brown 2026-10-04 21:51:55 +02:00
commit 27d0ec1e01
6 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/rt5682-sdw.c
View File

@ -704,8 +704,7 @@ static void rt5682_sdw_remove(struct sdw_slave *slave)
{
struct rt5682_priv *rt5682 = dev_get_drvdata(&slave->dev);
if (rt5682->hw_init)
cancel_delayed_work_sync(&rt5682->jack_detect_work);
cancel_delayed_work_sync(&rt5682->jack_detect_work);
pm_runtime_disable(&slave->dev);
}

6
sound/soc/codecs/rt711-sdca-sdw.c
View File

@ -369,10 +369,8 @@ static void rt711_sdca_sdw_remove(struct sdw_slave *slave)
{
struct rt711_sdca_priv *rt711 = dev_get_drvdata(&slave->dev);
if (rt711->hw_init) {
cancel_delayed_work_sync(&rt711->jack_detect_work);
cancel_delayed_work_sync(&rt711->jack_btn_check_work);
}
cancel_delayed_work_sync(&rt711->jack_detect_work);
cancel_delayed_work_sync(&rt711->jack_btn_check_work);
pm_runtime_disable(&slave->dev);

8
sound/soc/codecs/rt711-sdw.c
View File

@ -461,11 +461,9 @@ static void rt711_sdw_remove(struct sdw_slave *slave)
{
struct rt711_priv *rt711 = dev_get_drvdata(&slave->dev);
if (rt711->hw_init) {
cancel_delayed_work_sync(&rt711->jack_detect_work);
cancel_delayed_work_sync(&rt711->jack_btn_check_work);
cancel_work_sync(&rt711->calibration_work);
}
cancel_delayed_work_sync(&rt711->jack_detect_work);
cancel_delayed_work_sync(&rt711->jack_btn_check_work);
cancel_work_sync(&rt711->calibration_work);
pm_runtime_disable(&slave->dev);

6
sound/soc/codecs/rt712-sdca-sdw.c
View File

@ -386,10 +386,8 @@ static void rt712_sdca_sdw_remove(struct sdw_slave *slave)
{
struct rt712_sdca_priv *rt712 = dev_get_drvdata(&slave->dev);
if (rt712->hw_init) {
cancel_delayed_work_sync(&rt712->jack_detect_work);
cancel_delayed_work_sync(&rt712->jack_btn_check_work);
}
cancel_delayed_work_sync(&rt712->jack_detect_work);
cancel_delayed_work_sync(&rt712->jack_btn_check_work);
pm_runtime_disable(&slave->dev);

6
sound/soc/codecs/rt721-sdca-sdw.c
View File

@ -436,10 +436,8 @@ static void rt721_sdca_sdw_remove(struct sdw_slave *slave)
{
struct rt721_sdca_priv *rt721 = dev_get_drvdata(&slave->dev);
if (rt721->hw_init) {
cancel_delayed_work_sync(&rt721->jack_detect_work);
cancel_delayed_work_sync(&rt721->jack_btn_check_work);
}
cancel_delayed_work_sync(&rt721->jack_detect_work);
cancel_delayed_work_sync(&rt721->jack_btn_check_work);
if (rt721->first_hw_init)
pm_runtime_disable(&slave->dev);

6
sound/soc/codecs/rt722-sdca-sdw.c
View File

@ -471,10 +471,8 @@ static void rt722_sdca_sdw_remove(struct sdw_slave *slave)
{
struct rt722_sdca_priv *rt722 = dev_get_drvdata(&slave->dev);
if (rt722->hw_init) {
cancel_delayed_work_sync(&rt722->jack_detect_work);
cancel_delayed_work_sync(&rt722->jack_btn_check_work);
}
cancel_delayed_work_sync(&rt722->jack_detect_work);
cancel_delayed_work_sync(&rt722->jack_btn_check_work);
if (rt722->first_hw_init)
pm_runtime_disable(&slave->dev);