]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: Fix AC'97 registration unwind
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 17:03:27 +0000 (17:03 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 17:35:41 +0000 (17:35 +0000)
soc_unregister_ac97_dai_link() takes a CODEC as an argument, not a
rtd like the registration function, so give it what it's looking for.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/soc-core.c

index 68edc693a8a528d0067517bc2c9edaf6d50c5371..1dc4b11c19886d8d3b0a2390436e67ac62163a89 100644 (file)
@@ -1830,7 +1830,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
                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]);
+                               soc_unregister_ac97_dai_link(card->rtd[i].codec);
                        goto probe_aux_dev_err;
                }
        }