Commit a7dbb603 authored Apr 17, 2012 by Liam Girdwood Committed by Mark Brown Apr 17, 2012

ASoC: core: Fix card RTD count for deferred probe.



Currently we increment the number of RTD's per card during the DAI link
bind. This can cause an incorrect RTD count when we cannot find a component
and defer the probe (and hence perform the DAI link bind for the card again).

Fix the count so that it is cleared before every card registration
and bind attempt.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 86fc4998

sound/soc/soc-core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3119,6 +3119,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
		GFP_KERNEL);
		if (card->rtd == NULL)
		return -ENOMEM;
		card->num_rtd = 0;
		card->rtd_aux = &card->rtd[card->num_links];

		for (i = 0; i < card->num_links; i++)

Admin message