Merge branch 'fix/asoc' into for-linus

2012-05-05 11:27:26 +02:00 · 2012-05-05 11:27:26 +02:00 · e9e7183fd2
parent 20c76945d0 b339583c57
commit e9e7183fd2
1 changed files with 4 additions and 0 deletions
--- 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;
 }