From a6d5413a753c767443ead1052e08cf09198c3061 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 13 Dec 2010 17:03:27 +0000 Subject: [PATCH] ASoC: Fix AC'97 registration unwind 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 Acked-by: Liam Girdwood Reported-by: Mike Frysinger Acked-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 85b7d548f167..757ba59fd3a4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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; } }