Merge remote-tracking branch 'asoc/topic/core' into asoc-next

[karo-tx-linux.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 07aa54385ae0242a2412f0bca9e570772e0877c1..7e43f1db37c24923ed4bdd66062a697e69b28272 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1426,7 +1426,6 @@ static void soc_remove_aux_dev(struct snd_soc_card *card, int num)
 
        /* unregister the rtd device */
        if (rtd->dev_registered) {
-               device_remove_file(rtd->dev, &dev_attr_codec_reg);
                device_unregister(rtd->dev);
                rtd->dev_registered = 0;
        }
@@ -1689,6 +1688,8 @@ 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:
@@ -2380,8 +2381,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
 
        snd_soc_initialize_card_lists(card);
 
-       soc_init_card_debugfs(card);
-
        card->rtd = devm_kzalloc(card->dev,
                                 sizeof(struct snd_soc_pcm_runtime) *
                                 (card->num_links + card->num_aux_devs),
@@ -2412,7 +2411,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
 
        ret = snd_soc_instantiate_card(card);
        if (ret != 0)
-               soc_cleanup_card_debugfs(card);
+               return ret;
 
        /* deactivate pins to sleep state */
        for (i = 0; i < card->num_rtd; i++) {