| commit | 219b22b24546dbd512419766eb46f6b729a5453a | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Fri Oct 17 17:24:23 2008 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Fri Oct 17 17:24:23 2008 +0200 |
| tree | c8f55bda9a1264272c86c86f263040a1de45ea40 | |
| parent | 2190521e01ca4d33fd055dc2c4c92352f91b3c26 [diff] | |
| parent | 7c2dfee84863628f9af109131edd4344ce567d16 [diff] |
Merge branch 'topic/asoc' into for-linus
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index efbd0b3..7351db9 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c
@@ -831,7 +831,7 @@ 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