2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------ From: Mark Brown <[email protected]> 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 <[email protected]> Acked-by: Liam Girdwood <[email protected]> Reported-by: Mike Frysinger <[email protected]> Acked-by: Mike Frysinger <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1623,7 +1623,7 @@ static void snd_soc_instantiate_card(str 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; } } _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
