summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2011-01-13 22:48:32 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-13 23:28:01 +0000
commit150dd2f8c42bdb3c51533459e3ff5075d8720260 (patch)
tree067be50ee32e0ebf0941846c8bde351b56a9b4ba
parentb0e264855cc42106cc41426e68651b5d67df444d (diff)
downloadblackbird-op-linux-150dd2f8c42bdb3c51533459e3ff5075d8720260.tar.gz
blackbird-op-linux-150dd2f8c42bdb3c51533459e3ff5075d8720260.zip
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>
-rw-r--r--sound/soc/soc-core.c4
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)
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);
OpenPOWER on IntegriCloud