Skip to content

Commit

Permalink
dma: imx-sdma: start transfer in issue_pending
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sascha Hauer authored and Vinod Koul committed Jan 30, 2012
1 parent 5b31687 commit 2b4f130
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,15 +838,12 @@ static dma_cookie_t sdma_tx_submit(struct dma_async_tx_descriptor *tx)
{
unsigned long flags;
struct sdma_channel *sdmac = to_sdma_chan(tx->chan);
struct sdma_engine *sdma = sdmac->sdma;
dma_cookie_t cookie;

spin_lock_irqsave(&sdmac->lock, flags);

cookie = sdma_assign_cookie(sdmac);

sdma_enable_channel(sdma, sdmac->channel);

spin_unlock_irqrestore(&sdmac->lock, flags);

return cookie;
Expand Down Expand Up @@ -1135,9 +1132,11 @@ static enum dma_status sdma_tx_status(struct dma_chan *chan,

static void sdma_issue_pending(struct dma_chan *chan)
{
/*
* Nothing to do. We only have a single descriptor
*/
struct sdma_channel *sdmac = to_sdma_chan(chan);
struct sdma_engine *sdma = sdmac->sdma;

if (sdmac->status == DMA_IN_PROGRESS)
sdma_enable_channel(sdma, sdmac->channel);
}

#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34
Expand Down

0 comments on commit 2b4f130

Please sign in to comment.