1 files changed, 5 insertions, 2 deletions

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 81a7a12196ff..55f8278077f4 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2193,7 +2193,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
@@ -3831,8 +3834,8 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                                                 ret);
                                         goto out;
                                 }
-                                source->active++;
                         }
+                        source->active++;
                         ret = soc_dai_hw_params(&substream, params, source);
                         if (ret < 0)
                                 goto out;
@@ -3853,8 +3856,8 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                                                 ret);
                                         goto out;
                                 }
-                                sink->active++;
                         }
+                        sink->active++;
                         ret = soc_dai_hw_params(&substream, params, sink);
                         if (ret < 0)
                                 goto out;