From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 13 Dec 2010 17:03:27 +0000 (+0000)
Subject: ASoC: Fix AC'97 registration unwind
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7d8316df44053687625eef792d53b3ac62e82248;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

ASoC: Fix AC'97 registration unwind

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>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 68edc693a8a5..1dc4b11c1988 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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;
 		}
 	}