Merge branch 'fix/asoc' into for-linus

torvalds · May 5, 2012 · e9e7183 · e9e7183
2 parents 20c7694 + b339583
commit e9e7183
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;
 }