1 files changed, 3 insertions, 2 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 71585d0562fa..3f18fa7f090d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1559,6 +1559,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
                 goto base_error;
         }
 
+        soc_init_card_debugfs(card);
+
         card->dapm.bias_level = SND_SOC_BIAS_OFF;
         card->dapm.dev = card->dev;
         card->dapm.card = card;
@@ -1680,8 +1682,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
         mutex_unlock(&card->mutex);
         mutex_unlock(&client_mutex);
 
-        soc_init_card_debugfs(card);
-
         return 0;
 
 probe_aux_dev_err:
@@ -1695,6 +1695,7 @@ card_probe_error:
         if (card->remove)
                 card->remove(card);
 
+        soc_cleanup_card_debugfs(card);
         snd_card_free(card->snd_card);
 
 base_error: