leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Create card debugfs directory earlier

Browse Source 
Create the card debugfs directory at the begining of the initilization
rather then the end as various steps in the initilization sequence will try
to register files and sub-directories in the card directory.

Fixes: 4e2576bd36 ("ASoC: soc-core: initialize debugfs in snd_soc_instantiate_card()")
Reported-by: Fabio Estevam <festevam@gmail.com>
Reported-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2015-04-09 10:52:36 +02:00 committed by Mark Brown
parent 95a9ca7476
commit 0757d834eb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1559,6 +1559,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
goto base_error;
}
soc_init_card_debugfs(card);
card->dapm.bias_level = SND_SOC_BIAS_OFF;
card->dapm.dev = card->dev;
card->dapm.card = card;
@ -1680,8 +1682,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
mutex_unlock(&card->mutex);
mutex_unlock(&client_mutex);
soc_init_card_debugfs(card);
return 0;
probe_aux_dev_err:
@ -1695,6 +1695,7 @@ card_probe_error:
if (card->remove)
card->remove(card);
soc_cleanup_card_debugfs(card);
snd_card_free(card->snd_card);
base_error: