aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-05 11:26:50 +0200
committerTakashi Iwai <tiwai@suse.de>2012-05-05 11:26:50 +0200
commitb339583c57d38db1664a09e1eea3da86422eafdb (patch)
tree6211dced105475b36c884aac94581ed1baac4c01 /sound
parent06412088ce98f745405b8f65cfc51ddd6b842bbf (diff)
parentfad9365bcc2a69ae16adc092e8ac192354980665 (diff)
downloadlinux-linaro-stable-b339583c57d38db1664a09e1eea3da86422eafdb.tar.gz
Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc into fix/asoc
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;
}