| commit | b339583c57d38db1664a09e1eea3da86422eafdb | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Sat May 05 11:26:50 2012 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Sat May 05 11:26:50 2012 +0200 |
| tree | 6211dced105475b36c884aac94581ed1baac4c01 | |
| parent | 06412088ce98f745405b8f65cfc51ddd6b842bbf [diff] | |
| parent | fad9365bcc2a69ae16adc092e8ac192354980665 [diff] |
Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc into fix/asoc
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index a59bd35..5a649da 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c
@@ -401,6 +401,10 @@ } out: + /* free preallocated buffers in case of error */ + if (ret) + omap_pcm_free_dma_buffers(pcm); + return ret; }