diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-17 11:24:23 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-17 11:24:23 -0400 |
| commit | 219b22b24546dbd512419766eb46f6b729a5453a (patch) | |
| tree | c8f55bda9a1264272c86c86f263040a1de45ea40 | |
| parent | 2190521e01ca4d33fd055dc2c4c92352f91b3c26 (diff) | |
| parent | 7c2dfee84863628f9af109131edd4344ce567d16 (diff) | |
Merge branch 'topic/asoc' into for-linus
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index efbd0b37810a..7351db9606e4 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) | |||
| 831 | return ret; | 831 | return ret; |
| 832 | 832 | ||
| 833 | asoc_debugfs = debugfs_create_dir("asoc", NULL); | 833 | asoc_debugfs = debugfs_create_dir("asoc", NULL); |
| 834 | if (!IS_ERR(asoc_debugfs)) | 834 | if (!IS_ERR(asoc_debugfs) && asoc_debugfs) |
| 835 | debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs, | 835 | debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs, |
| 836 | &pop_time); | 836 | &pop_time); |
| 837 | else | 837 | else |