projects/linux·commit 660cd0dd

dmaengine: i.MX: Fix merge of cookie branch.

660cd0dd · Javier Martin <[email protected]> · 2012-03-22 14:54:15 +01:00

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 <[email protected]>
Signed-off-by: Vinod Koul <[email protected]>
Commit
660cd0dd94eba5201c69cd10f2d2fefb52807fa8
Parents
f606ab89

Changes

1 files changed · +1 −0

FileStatusAddDelContent
drivers/dma/imx-dma.cmodified+1−0View file

drivers/dma/imx-dma.c

View file
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 0f698f8..569b0a2 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);