summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-05-30 17:47:43 +0200
committerMark Brown <broonie@kernel.org>2019-05-30 17:47:43 +0200
commit79b3b7c4a396b9fa1963ac70e853998633e8151d (patch)
treec1e507b4a6fff773ec81e90e1be11f1b35e773b6 /sound/soc/soc-dapm.c
parentASoC: SOF: add COMPILE_TEST for PCI options (diff)
parentASoC: sun4i-codec: fix first delay on Speaker (diff)
downloadlinux-79b3b7c4a396b9fa1963ac70e853998633e8151d.tar.xz
linux-79b3b7c4a396b9fa1963ac70e853998633e8151d.zip
Merge branch 'asoc-5.2' into asoc-5.3
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 511ed84b147b..6b44b4a78b8e 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2194,7 +2194,10 @@ static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w)
static void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)
{
+ if (!dapm->debugfs_dapm)
+ return;
debugfs_remove_recursive(dapm->debugfs_dapm);
+ dapm->debugfs_dapm = NULL;
}
#else