summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-05 11:27:26 +0200
committerTakashi Iwai <tiwai@suse.de>2012-05-05 11:27:26 +0200
commite9e7183fd2677aca24e90ca1556d4afe7436d42d (patch)
treeca17a6d2b7248390739c32d0f80d5d6dbe2dcdcf /sound
parentMerge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff)
parentMerge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/a... (diff)
downloadlinux-e9e7183fd2677aca24e90ca1556d4afe7436d42d.tar.xz
linux-e9e7183fd2677aca24e90ca1556d4afe7436d42d.zip
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/omap-pcm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index a59bd352d342..5a649da9122a 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -401,6 +401,10 @@ static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd)
}
out:
+ /* free preallocated buffers in case of error */
+ if (ret)
+ omap_pcm_free_dma_buffers(pcm);
+
return ret;
}