diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-15 10:37:22 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-15 10:37:22 +0400 |
| commit | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (patch) | |
| tree | 73a224bf0371b41c9777c2bad8169ed50bcca879 /sound/soc/soc-dapm.c | |
| parent | d0f47ff17f29740eabbd64e11705b7332241714c (diff) | |
| parent | 5ec65ee589fdaca7298b6303fd74ad6c121a8f38 (diff) | |
| download | linux-828006de1bddf83b6ecf03ec459c15f7c7c22db7.tar.xz | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
Linus decided to go for another week so here's a few more updates - a
mixed bag here, a few minor diagnostic tweaks, some driver enhancements
and the dmaengine conversion for ep93xx drivers which was tested a while
ago and just waiting for a signoff.
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 a4d4aa1e6c49..dcd11609f930 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1667,7 +1667,7 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, dapm->debugfs_dapm = debugfs_create_dir("dapm", parent); if (!dapm->debugfs_dapm) { - printk(KERN_WARNING + dev_warn(dapm->dev, "Failed to create DAPM debugfs directory\n"); return; } |