[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1326101570-3716-4-git-send-email-s.hauer@pengutronix.de>
Date: Mon, 9 Jan 2012 10:32:49 +0100
From: Sascha Hauer <s.hauer@...gutronix.de>
To: linux-arm-kernel@...ts.infradead.org
Cc: Vinod Koul <vinod.koul@...el.com>,
Javier Martin <javier.martin@...ta-silicon.com>,
linux-kernel@...r.kernel.org,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Chris Ball <cjb@...top.org>,
Sascha Hauer <s.hauer@...gutronix.de>
Subject: [PATCH 3/4] dma: imx-dma: start transfer in issue_pending
The DMA API requires that transfers are started in issue_pending
instead of tx_submit. Fix this.
Signed-off-by: Sascha Hauer <s.hauer@...gutronix.de>
---
drivers/dma/imx-dma.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 4be55f9..217207b 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)
--
1.7.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists