Unverified Commit df95a16d authored Nov 06, 2019 by Pierre-Louis Bossart Committed by Mark Brown Nov 06, 2019

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 <ranjani.sridharan@linux.intel.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fixes: 5a4c9f05 ("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>

parent 509ba54f

sound/soc/soc-core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message