ASoC: soc-core: fix RIP warning on card removal

SOF module load/unload tests show nasty recurring warnings:

WARNING: CPU: 5 PID: 1339 at sound/core/control.c:466
snd_ctl_remove+0xf0/0x100 [snd]
RIP: 0010:snd_ctl_remove+0xf0/0x100 [snd]

This regression was introduced by the removal of the call to
soc_remove_link_components() before soc_card_free() is invoked.

Go back to the initial order but only call
soc_remove_link_components() once.

Reviewed-by: Ranjani Sridharan <[email protected]>
Acked-by: Kuninori Morimoto <[email protected]>
Fixes: 5a4c9f054ceea ("ASoC: soc-core: snd_soc_unbind_card() cleanup")
GitHub issue: https://github.com/thesofproject/linux/issues/1424
Signed-off-by: Pierre-Louis Bossart <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index cc596871ba7f8768616b3c6a4ab3c697f5999d24..a7ad81ec59dbe93f9b147db4e501ae22376487e8 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1974,6 +1974,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
 {
        struct snd_soc_dai_link *link, *_link;
 
+       /* This should be called before snd_card_free() */
+       soc_remove_link_components(card);
+
        /* free the ALSA card at first; this syncs with pending operations */
        if (card->snd_card) {
                snd_card_free(card->snd_card);
@@ -1982,7 +1985,6 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
 
        /* remove and free each DAI */
        soc_remove_link_dais(card);
-       soc_remove_link_components(card);
 
        for_each_card_links_safe(card, link, _link)
                snd_soc_remove_dai_link(card, link);