ASoC: Fix snd_soc_instantiate_card error path

Properly free the resources in the case of snd_card_register failure
and soc_register_ac97_dai_link failure.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 392d33625327..b4c8c3800503 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1839,18 +1839,20 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
         ret = snd_card_register(card->snd_card);
         if (ret < 0) {
                 printk(KERN_ERR "asoc: failed to register soundcard for %s\n", card->name);
-                goto probe_dai_err;
+                goto probe_aux_dev_err;
         }
 
 #ifdef CONFIG_SND_SOC_AC97_BUS
         /* register any AC97 codecs */
         for (i = 0; i < card->num_rtd; i++) {
-                        ret = soc_register_ac97_dai_link(&card->rtd[i]);
-                        if (ret < 0) {
-                                printk(KERN_ERR "asoc: failed to register AC97 %s\n", card->name);
-                                goto probe_dai_err;
-                        }
+                ret = soc_register_ac97_dai_link(&card->rtd[i]);
+                if (ret < 0) {
+                        printk(KERN_ERR "asoc: failed to register AC97 %s\n", card->name);
+                        while (--i >= 0)
+                                soc_unregister_ac97_dai_link(&card->rtd[i]);
+                        goto probe_aux_dev_err;
                 }
+        }
 #endif
 
         card->instantiated = 1;