summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/soc/soc-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 92260a9569a2..216000ae3e20 100644
--- 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);