diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-21 01:39:47 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-21 01:39:47 +0300 |
| commit | 55fa518867978e1f5fd8353098f80d125ac734d7 (patch) | |
| tree | 3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /sound/soc/soc-dapm.c | |
| parent | bb1f24bf00a85f666b56a09b7cdbfd221af16c2c (diff) | |
| parent | eea0579fc85e64e9f05361d5aacf496fe7a151aa (diff) | |
| download | linux-55fa518867978e1f5fd8353098f80d125ac734d7.tar.xz | |
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -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) 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 |