diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-05 11:26:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-05 11:26:50 +0200 |
| commit | b339583c57d38db1664a09e1eea3da86422eafdb (patch) | |
| tree | 6211dced105475b36c884aac94581ed1baac4c01 /sound | |
| parent | ASoC: s3c2412-i2s: Fix dai registration (diff) | |
| parent | ASoC: omap-pcm: Free dma buffers in case of error. (diff) | |
| download | linux-b339583c57d38db1664a09e1eea3da86422eafdb.tar.xz linux-b339583c57d38db1664a09e1eea3da86422eafdb.zip | |
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.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; } |