diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-13 17:03:27 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 15:14:29 -0800 |
| commit | a6d5413a753c767443ead1052e08cf09198c3061 (patch) | |
| tree | a0aa9cb4af366e52d3001c565c4bb17d4c79552c /sound | |
| parent | 65e603adc82c3da0e8bdb908a0257110c93ff507 (diff) | |
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 <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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |