diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-05 11:27:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-05 11:27:26 +0200 |
| commit | e9e7183fd2677aca24e90ca1556d4afe7436d42d (patch) | |
| tree | ca17a6d2b7248390739c32d0f80d5d6dbe2dcdcf /sound | |
| parent | 20c76945d05e26dc24eabcfc2f61f3929590cc29 (diff) | |
| parent | b339583c57d38db1664a09e1eea3da86422eafdb (diff) | |
| download | linux-stable-e9e7183fd2677aca24e90ca1556d4afe7436d42d.tar.gz linux-stable-e9e7183fd2677aca24e90ca1556d4afe7436d42d.tar.bz2 linux-stable-e9e7183fd2677aca24e90ca1556d4afe7436d42d.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 4 |
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; } |