summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-13 17:03:27 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-13 17:35:41 +0000
commit7d8316df44053687625eef792d53b3ac62e82248 (patch)
tree77a58f46edf89ce1f7e7930fb6ce1d909c719ff6 /sound/soc/soc-core.c
parent0f0e25282b93242780a405585a8e3e6f0cc7fa91 (diff)
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>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 68edc693a8a..1dc4b11c198 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;
}
}