diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 10:07:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 10:07:06 -0700 |
commit | 1c2f95480648ed7326ab2288ca0e2d35551db4be (patch) | |
tree | fa69d267423242eaad195e60c74570152e6c3d84 /sound/soc/omap | |
parent | 59068e369b6a2a0a15b93624887525d9ec0f36e5 (diff) | |
parent | e9e7183fd2677aca24e90ca1556d4afe7436d42d (diff) | |
download | op-kernel-dev-1c2f95480648ed7326ab2288ca0e2d35551db4be.zip op-kernel-dev-1c2f95480648ed7326ab2288ca0e2d35551db4be.tar.gz |
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound sound fixes from Takashi Iwai:
"As good as nothing exciting here; just a few trivial fixes for various
ASoC stuff."
* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: omap-pcm: Free dma buffers in case of error.
ASoC: s3c2412-i2s: Fix dai registration
ASoC: wm8350: Don't use locally allocated codec struct
ASoC: tlv312aic23: unbreak resume
ASoC: bf5xx-ssm2602: Set DAI format
ASoC: core: check of_property_count_strings failure
ASoC: dt: sgtl5000.txt: Add description for 'reg' field
ASoC: wm_hubs: Make sure we don't disable differential line outputs
Diffstat (limited to 'sound/soc/omap')
-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 a59bd35..5a649da 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; } |