openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: soc-core: care card_probed at soc_cleanup_card_resources() 

soc_cleanup_card_resources() will call card->remove(), but it should be
called if card->probe() or card->late_probe() are called.
snd_soc_bind_card() might be error before calling
card->probe() / card->late_probe().
In that time, card->remove() will be called.
This patch adds card_probed parameter to judge it.

Fixes: bfce78a559 ("ASoC: soc-core: tidyup soc_init_dai_link()")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/87o8xg4ltr.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-11-13 10:16:48 +09:00 committed by Mark Brown
parent 2cc1afcfc6
commit ce21401c9d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/soc-core.c
View File

@ -1940,7 +1940,8 @@ static void __soc_setup_card_name(char *name, int len,
}
}
static void soc_cleanup_card_resources(struct snd_soc_card *card)
static void soc_cleanup_card_resources(struct snd_soc_card *card,
int card_probed)
{
struct snd_soc_dai_link *link, *_link;
@ -1969,17 +1970,19 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
soc_cleanup_card_debugfs(card);
/* remove the card */
if (card->remove)
if (card_probed && card->remove)
card->remove(card);
}
static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister)
{
if (card->instantiated) {
int card_probed = 1;
card->instantiated = false;
snd_soc_flush_all_delayed_work(card);
soc_cleanup_card_resources(card);
soc_cleanup_card_resources(card, card_probed);
if (!unregister)
list_add(&card->list, &unbind_card_list);
} else {
@ -1992,7 +1995,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
{
struct snd_soc_pcm_runtime *rtd;
struct snd_soc_dai_link *dai_link;
int ret, i;
int ret, i, card_probed = 0;
mutex_lock(&client_mutex);
mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT);
@ -2044,6 +2047,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
ret = card->probe(card);
if (ret < 0)
goto probe_end;
card_probed = 1;
}
/* probe all components used by DAI links on this card */
@ -2109,6 +2113,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
goto probe_end;
}
}
card_probed = 1;
snd_soc_dapm_new_widgets(card);
@ -2138,7 +2143,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
probe_end:
if (ret < 0)
soc_cleanup_card_resources(card);
soc_cleanup_card_resources(card, card_probed);
mutex_unlock(&card->mutex);
mutex_unlock(&client_mutex);