ASoC: soc-core: fix RIP warning on card removal
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Wed, 6 Nov 2019 14:58:01 +0000 (08:58 -0600)
committerMark Brown <broonie@kernel.org>
Wed, 6 Nov 2019 15:32:21 +0000 (15:32 +0000)
commitdf95a16d2a9626dcfc3f2b3671c9b91fa076c997
tree225dc1f40f5ea1cd2dd6987e6db826512af17512
parent509ba54fcfd1e45bceebe8ccea59dc496312f1a0
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: 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>
sound/soc/soc-core.c