From: Zhaolei <zhaolei@cn.fujitsu.com>
Date: Fri, 17 Oct 2008 13:04:55 +0000 (+0800)
Subject: ALSA: Fix debugfs_create_dir's error checking method for sound/soc/
X-Git-Tag: v2.6.28-rc1~102^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7c2dfee84863628f9af109131edd4344ce567d16;p=linux-2.6-omap-h63xx.git

ALSA: Fix debugfs_create_dir's error checking method for sound/soc/

debugfs_create_dir() returns NULL if an error occurs, returns -ENODEV
when debugfs is not enabled in the kernel.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index efbd0b37810..7351db9606e 100644
--- 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