ASoC: soc-core: fix RIP warning on card removal
diff mbox series

Message ID
State Accepted
Commit df95a16d2a9626dcfc3f2b3671c9b91fa076c997
Headers show
  • ASoC: soc-core: fix RIP warning on card removal
Related show

Commit Message

Pierre-Louis Bossart Nov. 6, 2019, 2:58 p.m. UTC
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 <>
Acked-by: Kuninori Morimoto <>
Fixes: 5a4c9f054ceea ("ASoC: soc-core: snd_soc_unbind_card() cleanup")
GitHub issue:
Signed-off-by: Pierre-Louis Bossart <>
 sound/soc/soc-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b07ecfac39d7..1e08fb5da170 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1951,6 +1951,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) {
@@ -1959,7 +1962,6 @@  static void soc_cleanup_card_resources(struct snd_soc_card *card)
 	/* remove and free each DAI */
-	soc_remove_link_components(card);
 	for_each_card_links_safe(card, link, _link)
 		snd_soc_remove_dai_link(card, link);