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