Merge branch 'next' into for-linus

[karo-tx-linux.git] / sound / soc / samsung / dma.c

diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
index 851346f7d68dc3ddf4cbb95c116b7413ef17096d..a68b2644178477dd7fd6a5c0518498e4ff5da860 100644 (file)
--- a/sound/soc/samsung/dma.c
+++ b/sound/soc/samsung/dma.c
@@ -16,6 +16,7 @@
 
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
+#include <linux/module.h>
 
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
@@ -198,10 +199,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;