]> git.ipfire.org Git - people/ms/linux.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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 23:14:29 +0000 (15:14 -0800)
commit 7d8316df44053687625eef792d53b3ac62e82248 upstream.

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>
Reported-by: Mike Frysinger <vapier.adi@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/soc/soc-core.c

index 85b7d548f1675f14c1a2065bbcffcf7d229a2e27..757ba59fd3a41e9784f447742c0e659ab550965d 100644 (file)
@@ -1623,7 +1623,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_dai_err;
                }
        }