ASoC: soc-core: call snd_soc_dapm_shutdown() at soc_cleanup_card_resources()

It is easy to read code if it is cleanly using paired function/naming,
like start <-> stop, register <-> unregister, etc, etc.
But, current ALSA SoC code is very random, unbalance, not paired, etc.
It is easy to create bug at the such code, and it will be difficult to
debug.

snd_soc_bind_card() is calling snd_soc_dapm_init() for both
card and component.
Let's call paired snd_soc_dapm_shutdown() at paired
soc_cleanup_card_resources().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87r22c4lub.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 92260a9569a217d3663f4bbc6787265dc3855afb..216000ae3e209f0c9a21b08f782c7377038427dd 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1953,6 +1953,8 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
                card->snd_card = NULL;
        }
 
+       snd_soc_dapm_shutdown(card);
+
        /* remove and free each DAI */
        soc_remove_link_dais(card);
 
@@ -2389,7 +2391,6 @@ static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister)
 {
        if (card->instantiated) {
                card->instantiated = false;
-               snd_soc_dapm_shutdown(card);
                snd_soc_flush_all_delayed_work(card);
 
                soc_cleanup_card_resources(card);