| Message ID | 1428569558-15883-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0757d834eb7482e5763fb9ee014abb50789f906a |
| Headers | show |
On Thu, Apr 09, 2015 at 10:52:36AM +0200, Lars-Peter Clausen wrote: > 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. Applied, thanks.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2801578..7bd1599 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1555,6 +1555,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; @@ -1684,8 +1686,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: @@ -1699,6 +1699,7 @@ card_probe_error: if (card->remove) card->remove(card); + soc_cleanup_card_debugfs(card); snd_card_free(card->snd_card); base_error:
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: 4e2576bd36a1 ("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> --- sound/soc/soc-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)