diff options
author | Vinod Koul <vinod.koul@intel.com> | 2011-01-13 12:18:32 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 18:28:01 -0500 |
commit | 150dd2f8c42bdb3c51533459e3ff5075d8720260 (patch) | |
tree | 067be50ee32e0ebf0941846c8bde351b56a9b4ba /sound/soc/soc-core.c | |
parent | b0e264855cc42106cc41426e68651b5d67df444d (diff) |
ASoC: soc core move the card debugfs initialization
The card debugfs initialization is done in soc_probe but would be better if it
is done when the card in registered
This patch moves the debugfs initialization to register_card()
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Harsha Priya <harsha.priya@intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 318c3a720216..9c5e7cff3f01 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -1879,8 +1879,6 @@ static int soc_probe(struct platform_device *pdev) | |||
1879 | INIT_LIST_HEAD(&card->paths); | 1879 | INIT_LIST_HEAD(&card->paths); |
1880 | INIT_LIST_HEAD(&card->dapm_list); | 1880 | INIT_LIST_HEAD(&card->dapm_list); |
1881 | 1881 | ||
1882 | soc_init_card_debugfs(card); | ||
1883 | |||
1884 | ret = snd_soc_register_card(card); | 1882 | ret = snd_soc_register_card(card); |
1885 | if (ret != 0) { | 1883 | if (ret != 0) { |
1886 | dev_err(&pdev->dev, "Failed to register card\n"); | 1884 | dev_err(&pdev->dev, "Failed to register card\n"); |
@@ -3123,6 +3121,8 @@ static int snd_soc_register_card(struct snd_soc_card *card) | |||
3123 | if (!card->name || !card->dev) | 3121 | if (!card->name || !card->dev) |
3124 | return -EINVAL; | 3122 | return -EINVAL; |
3125 | 3123 | ||
3124 | soc_init_card_debugfs(card); | ||
3125 | |||
3126 | card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) * | 3126 | card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) * |
3127 | (card->num_links + card->num_aux_devs), | 3127 | (card->num_links + card->num_aux_devs), |
3128 | GFP_KERNEL); | 3128 | GFP_KERNEL); |