summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-08 10:33:47 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-05-08 12:29:15 +0100
commitb3bba9a1a8dfcd338eb7d099dcd53daacb698f8b (patch)
tree3901a8c5bd598ce3cb738799e2f59fe1b504ab6c /sound
parent3bb8a819c6995478f5e76d62726caae92d3123b4 (diff)
ASoC: pcm: Fix DPCM for aux_devs
When we instantiate an aux_dev we use a fake rtd as part of the process which doesn't have a dai_link associated with it. Fix the dpcm startup code to cope with this. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-pcm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index c0b394fdd689..4f824cbd66f4 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2332,6 +2332,9 @@ static const struct file_operations dpcm_state_fops = {
int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
{
+ if (!rtd->dai_link)
+ return 0;
+
rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name,
rtd->card->debugfs_card_root);
if (!rtd->debugfs_dpcm_root) {