ASoC: core: Fix card RTD count for deferred probe.
PATCH 1/1 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.
--- sound/soc/soc-core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
sound/soc/soc-core.c +1 -0
@@ -3155,6 +3155,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++)
Signature · 1 line
1.7.5.4
Quoted 6 lines · Liam Girdwood
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.
Hrm, I wonder why this ever worked even with the home grown retry code... anyway, I'll apply.