summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-01-09 10:32:49 +0100
committerVinod Koul <vinod.koul@linux.intel.com>2012-01-30 10:20:39 +0100
commit5b3168763f507fd46285b7310fc2d18dafe7f1c7 (patch)
tree886a9334514b223892b9a6c236e24840e6cbdab8
parentASoC: i.MX: Add missing dma_async_issue_pending (diff)
downloadlinux-5b3168763f507fd46285b7310fc2d18dafe7f1c7.tar.xz
linux-5b3168763f507fd46285b7310fc2d18dafe7f1c7.zip
dma: imx-dma: start transfer in issue_pending
The DMA engine API requires that transfers are started in issue_pending instead of tx_submit. Fix this. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> [corrected change log to DMA engine API insteadof DMA API] Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
-rw-r--r--drivers/dma/imx-dma.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index e4383ee2c9ac..3296a7337f25 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -186,8 +186,6 @@ static dma_cookie_t imxdma_tx_submit(struct dma_async_tx_descriptor *tx)
cookie = imxdma_assign_cookie(imxdmac);
- imx_dma_enable(imxdmac->imxdma_channel);
-
spin_unlock_irq(&imxdmac->lock);
return cookie;
@@ -332,9 +330,10 @@ static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic(
static void imxdma_issue_pending(struct dma_chan *chan)
{
- /*
- * Nothing to do. We only have a single descriptor
- */
+ struct imxdma_channel *imxdmac = to_imxdma_chan(chan);
+
+ if (imxdmac->status == DMA_IN_PROGRESS)
+ imx_dma_enable(imxdmac->imxdma_channel);
}
static int __init imxdma_probe(struct platform_device *pdev)