summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown2015-04-12 20:48:30 +0200
committerMark Brown2015-04-12 20:48:30 +0200
commitd1113af4e8c0f2cd71e52cb904447bd0eec8aa54 (patch)
tree60de96c5b9716f6115ed68507c0deb361d063569 /sound/soc/soc-dapm.c
parentMerge tag 'asoc-v4.1' into asoc-next (diff)
parentASoC: core: call snd_soc_runtime_set_dai_fmt() before soc_new_pcm() (diff)
downloadkernel-qcow2-linux-d1113af4e8c0f2cd71e52cb904447bd0eec8aa54.tar.gz
kernel-qcow2-linux-d1113af4e8c0f2cd71e52cb904447bd0eec8aa54.tar.xz
kernel-qcow2-linux-d1113af4e8c0f2cd71e52cb904447bd0eec8aa54.zip
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b6f88202b8c9..1fd2d458824e 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1898,6 +1898,9 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
{
struct dentry *d;
+ if (!parent)
+ return;
+
dapm->debugfs_dapm = debugfs_create_dir("dapm", parent);
if (!dapm->debugfs_dapm) {