diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:30:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:30:35 -0700 |
| commit | 8eb88c80d444fd249edaa7d895666cde79e7b3b8 (patch) | |
| tree | 8518f579c841abc05075285a1d4683caa6eec9c2 /sound/soc/soc-dapm.c | |
| parent | c53dbf54863e7f3b0b8810dda2bdd0290006bdac (diff) | |
| parent | 219b22b24546dbd512419766eb46f6b729a5453a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: Fix debugfs_create_dir's error checking method for sound/soc/
ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API
ALSA: kernel docs: fix sound/core/ kernel-doc
ALSA: Handle NULL jacks in snd_jack_report()
ALSA: hda - Fix PCM type of Nvidia HDMI devices
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 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 |