Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0757d834 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Create card debugfs directory earlier 



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: 4e2576bd ("ASoC: soc-core: initialize debugfs in snd_soc_instantiate_card()")
Reported-by: default avatarFabio Estevam <festevam@gmail.com>
Reported-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 95a9ca74

sound/soc/soc-core.c

+3 −2
Original line number Diff line number Diff line
@@ -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 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
	if (card->remove)

		card->remove(card);



	soc_cleanup_card_debugfs(card);

	snd_card_free(card->snd_card);



base_error: