[alsa-devel] [PATCH] ASoC: Fix AC'97 registration unwind

[Liam Girdwood]

On Mon, 2010-12-13 at 17:04 +0000, Mark Brown wrote:
> 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 at opensource.wolfsonmicro.com>
> ---
>  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 68edc69..1dc4b11 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;
>  		}
>  	}

Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk