diff options
| author | Javier Martin <javier.martin@vista-silicon.com> | 2012-03-22 14:54:15 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-03-26 08:01:32 +0200 |
| commit | 660cd0dd94eba5201c69cd10f2d2fefb52807fa8 (patch) | |
| tree | 227318217703120f49de136c659cba84109a22d9 | |
| parent | dmaengine: i.MX: Add support for interleaved transfers. (diff) | |
| download | linux-660cd0dd94eba5201c69cd10f2d2fefb52807fa8.tar.xz linux-660cd0dd94eba5201c69cd10f2d2fefb52807fa8.zip | |
dmaengine: i.MX: Fix merge of cookie branch.
When merging DMA cookie changes a small chunk
of code was dropped. This broke imx-dma driver.
This patch adds this chunk again and fixes the problem.
Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
| -rw-r--r-- | drivers/dma/imx-dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 0f698f883cca..569b0a29fa8c 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -679,6 +679,7 @@ static dma_cookie_t imxdma_tx_submit(struct dma_async_tx_descriptor *tx) unsigned long flags; spin_lock_irqsave(&imxdma->lock, flags); + list_move_tail(imxdmac->ld_free.next, &imxdmac->ld_queue); cookie = dma_cookie_assign(tx); spin_unlock_irqrestore(&imxdma->lock, flags); |