p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: soc-core: initialize debugfs in snd_soc_instantiate_card() 

Current soc_init_card_debugfs() is called from snd_soc_register_card()
but, soc_cleanup_card_debugfs() is called from soc_cleanup_card_resources(),
not from paired function.

This differences don't matter for now. But if anyone wants to implement
a proper hotplug/unplug, this difference would become clearer.

Now, we can assume that snd_soc_instantiate_card() and
soc_cleanup_card_resources() are paired function.
soc_init_card_debugfs() / soc_cleanup_card_debugfs() paired function
should be called from these.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2015-03-24 09:01:00 +00:00 committed by Mark Brown
parent 778952598e
commit 4e2576bd36
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1662,6 +1662,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
snd_soc_dapm_sync(&card->dapm); snd_soc_dapm_sync(&card->dapm);
mutex_unlock(&card->mutex); mutex_unlock(&card->mutex);
soc_init_card_debugfs(card);
return 0; return 0;
probe_aux_dev_err: probe_aux_dev_err:
@ -2352,8 +2354,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
snd_soc_initialize_card_lists(card); snd_soc_initialize_card_lists(card);
soc_init_card_debugfs(card);
card->rtd = devm_kzalloc(card->dev, card->rtd = devm_kzalloc(card->dev,
sizeof(struct snd_soc_pcm_runtime) * sizeof(struct snd_soc_pcm_runtime) *
(card->num_links + card->num_aux_devs), (card->num_links + card->num_aux_devs),
@ -2384,7 +2384,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
ret = snd_soc_instantiate_card(card); ret = snd_soc_instantiate_card(card);
if (ret != 0) if (ret != 0)
soc_cleanup_card_debugfs(card); return ret;
/* deactivate pins to sleep state */ /* deactivate pins to sleep state */
for (i = 0; i < card->num_rtd; i++) { for (i = 0; i < card->num_rtd; i++) {