Merge branch 'topic/asoc' into for-linus

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index efbd0b37810aba581672c1208bf82a99a2d1554a..7351db9606e48f3d11870671a4b9e71c37081e50 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -831,7 +831,7 @@ int snd_soc_dapm_sys_add(struct device *dev)
                return ret;
 
        asoc_debugfs = debugfs_create_dir("asoc", NULL);
-       if (!IS_ERR(asoc_debugfs))
+       if (!IS_ERR(asoc_debugfs) && asoc_debugfs)
                debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs,
                                   &pop_time);
        else