aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-12 10:44:04 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-15 09:50:16 -0400
commit13cb61f8c261ca6a218f83f4ee9c3bd5cfc223a5 (patch)
tree50372278ce3f2cde8dabe7f58f4eda028b98e5c0 /sound/soc/soc-core.c
parent381ac990db3f4fdfbe91e3a636cab03edf293b9c (diff)
ASoC: Set up debugfs only once per CODEC
Since the debugfs directory is current per CODEC we should only init it when the CODEC is initialised, otherwise we end up with errors being generated when an attempt is made to add duplicate debugfs entries. Since most of this stuff is actually for the card we should refactor but this can come later. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a004876a39a9..ac0fa228c7b3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1323,6 +1323,9 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num)
1323 return ret; 1323 return ret;
1324 } 1324 }
1325 } 1325 }
1326
1327 soc_init_codec_debugfs(codec);
1328
1326 /* mark codec as probed and add to card codec list */ 1329 /* mark codec as probed and add to card codec list */
1327 codec->probed = 1; 1330 codec->probed = 1;
1328 list_add(&codec->card_list, &card->codec_dev_list); 1331 list_add(&codec->card_list, &card->codec_dev_list);
@@ -1400,8 +1403,6 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num)
1400 if (ret < 0) 1403 if (ret < 0)
1401 printk(KERN_WARNING "asoc: failed to add codec sysfs files\n"); 1404 printk(KERN_WARNING "asoc: failed to add codec sysfs files\n");
1402 1405
1403 soc_init_codec_debugfs(codec);
1404
1405 /* create the pcm */ 1406 /* create the pcm */
1406 ret = soc_new_pcm(rtd, num); 1407 ret = soc_new_pcm(rtd, num);
1407 if (ret < 0) { 1408 if (ret < 0) {