ASoC: Flush Samsung DMA on free
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 26 Sep 2011 22:29:11 +0000 (07:29 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 4 Oct 2011 09:59:44 +0000 (18:59 +0900)
Ever since it was written the Samsung DMA driver has had a TODO in the
hw_free() function wondering if we need to flush the DMA buffers. Up until
now the answer has been no but with the recent improvements Boojin has
done to the DMA infrastructure for the Samsung port the answer has changed
to yes for at least S3C6410 systems.

If we don't then when we next prepare() the channel the API will get
confused trying to run callbacks on the transfers hanging around from the
previous time the stream was open and oops.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Boojin Kim <boojin.kim@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
sound/soc/samsung/dma.c

index 851346f7d68dc3ddf4cbb95c116b7413ef17096d..2d622b635e68babe502615286aaf7e475741918e 100644 (file)
@@ -198,10 +198,10 @@ static int dma_hw_free(struct snd_pcm_substream *substream)
 
        pr_debug("Entered %s\n", __func__);
 
-       /* TODO - do we need to ensure DMA flushed */
        snd_pcm_set_runtime_buffer(substream, NULL);
 
        if (prtd->params) {
+               prtd->params->ops->flush(prtd->params->ch);
                prtd->params->ops->release(prtd->params->ch,
                                        prtd->params->client);
                prtd->params = NULL;