Merge branch 'topic/asoc' into for-linus

git-mirror · Oct 17, 2008 · 219b22b · 219b22b
2 parents 2190521 + 7c2dfee
commit 219b22b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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