| commit | e9e7183fd2677aca24e90ca1556d4afe7436d42d | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Sat May 05 11:27:26 2012 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Sat May 05 11:27:26 2012 +0200 |
| tree | ca17a6d2b7248390739c32d0f80d5d6dbe2dcdcf | |
| parent | 20c76945d05e26dc24eabcfc2f61f3929590cc29 [diff] | |
| parent | b339583c57d38db1664a09e1eea3da86422eafdb [diff] |
Merge branch 'fix/asoc' into for-linus
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; }