Merge branch 'topic/asoc' into for-linus

219b22b2 · Takashi Iwai · 2190521e · 7c2dfee8 · 219b22b2
Commit 219b22b2 authored Oct 17, 2008 by Takashi Iwai
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/soc-dapm.c sound/soc/soc-dapm.c +1 -1

No files found.
--- 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