]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: topology: Do not call snd_soc_remove_pcm_runtime() for ignored links
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Thu, 19 Jun 2025 08:42:19 +0000 (11:42 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 19 Jun 2025 12:19:13 +0000 (13:19 +0100)
If a link has been ignored then it is not even added.
The snd_soc_get_pcm_runtime() will return NULL as the runtime will does
not exist.
We can just skip this step to avoid performing a lookup to do nothing.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://patch.msgid.link/20250619084222.559-2-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-topology.c

index 7b0b8531bb32f51ea34722132feda35cc6f67b61..44b60324eaa2e9896ed03fd3e5905dbbbcb275b8 100644 (file)
@@ -429,8 +429,11 @@ static void soc_tplg_remove_link(struct snd_soc_component *comp,
                dobj->unload(comp, dobj);
 
        list_del(&dobj->list);
-       snd_soc_remove_pcm_runtime(comp->card,
-                       snd_soc_get_pcm_runtime(comp->card, link));
+
+       /* Ignored links do not need to be removed, they are not added */
+       if (!link->ignore)
+               snd_soc_remove_pcm_runtime(comp->card,
+                               snd_soc_get_pcm_runtime(comp->card, link));
 }
 
 /* unload dai link */