From: John Ogness Date: Mon, 27 Apr 2015 11:52:25 +0000 (+0200) Subject: dmaenegine: edma: allow pause/resume for non-cyclic mode X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=02ec6041a8dd17d9bd7dd12eb6280a6b112f83e5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git dmaenegine: edma: allow pause/resume for non-cyclic mode The 8250_omap serial driver relies on dmaengine_pause() actually pausing the DMA transfer. Before this patch dmaengine_pause() is a NOP for non-cylic DMA transfers. This allowed the 8250_omap driver to read DMA buffers while the DMA was still active, resulting in lost serial data. Signed-off-by: John Ogness Acked-by: Peter Ujfalusi Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index bf09db7ca9ee..88853af69489 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -300,8 +300,7 @@ static int edma_dma_pause(struct dma_chan *chan) { struct edma_chan *echan = to_edma_chan(chan); - /* Pause/Resume only allowed with cyclic mode */ - if (!echan->edesc || !echan->edesc->cyclic) + if (!echan->edesc) return -EINVAL; edma_pause(echan->ch_num); @@ -312,10 +311,6 @@ static int edma_dma_resume(struct dma_chan *chan) { struct edma_chan *echan = to_edma_chan(chan); - /* Pause/Resume only allowed with cyclic mode */ - if (!echan->edesc->cyclic) - return -EINVAL; - edma_resume(echan->ch_num); return 0; }