Merge branch 'fix/asoc' into for-linus

tiwai · tiwai · commit e9e7183fd267 · 2012-05-05T11:27:26.000+02:00
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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,10 @@ static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd)`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`out:`
	`404`	`+ /* free preallocated buffers in case of error */`
	`405`	`+ if (ret)`
	`406`	`+ omap_pcm_free_dma_buffers(pcm);`
	`407`	`+`
`404`	`408`	`return ret;`
`405`	`409`	`}`
`406`	`410`