ASoC: soc core move the card debugfs initialization
authorVinod Koul <vinod.koul@intel.com>
Thu, 13 Jan 2011 17:18:32 +0000 (22:48 +0530)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 13 Jan 2011 23:28:01 +0000 (23:28 +0000)
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>
sound/soc/soc-core.c

index 318c3a7..9c5e7cf 100644 (file)
@@ -1879,8 +1879,6 @@ static int soc_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&card->paths);
        INIT_LIST_HEAD(&card->dapm_list);
 
-       soc_init_card_debugfs(card);
-
        ret = snd_soc_register_card(card);
        if (ret != 0) {
                dev_err(&pdev->dev, "Failed to register card\n");
@@ -3123,6 +3121,8 @@ static int snd_soc_register_card(struct snd_soc_card *card)
        if (!card->name || !card->dev)
                return -EINVAL;
 
+       soc_init_card_debugfs(card);
+
        card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) *
                            (card->num_links + card->num_aux_devs),
                            GFP_KERNEL);