iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 <ranjani.sridharan@linux.intel.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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 <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191106145801.9316-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2019-11-06 08:58:01 -06:00 committed by Mark Brown
parent 509ba54fcf
commit df95a16d2a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/soc-core.c
View File

@ -1974,6 +1974,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
{ {
struct snd_soc_dai_link *link, *_link; 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 */ /* free the ALSA card at first; this syncs with pending operations */
if (card->snd_card) { if (card->snd_card) {
snd_card_free(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 */ /* remove and free each DAI */
soc_remove_link_dais(card); soc_remove_link_dais(card);
soc_remove_link_components(card);
for_each_card_links_safe(card, link, _link) for_each_card_links_safe(card, link, _link)
snd_soc_remove_dai_link(card, link); snd_soc_remove_dai_link(card, link);