projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f606ab8
)
dmaengine: i.MX: Fix merge of cookie branch.
author
Javier Martin
<javier.martin@vista-silicon.com>
Thu, 22 Mar 2012 13:54:15 +0000
(14:54 +0100)
committer
Vinod Koul
<vinod.koul@linux.intel.com>
Mon, 26 Mar 2012 06:01:32 +0000
(11:31 +0530)
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>
drivers/dma/imx-dma.c
patch
|
blob
|
history
diff --git
a/drivers/dma/imx-dma.c
b/drivers/dma/imx-dma.c
index
0f698f8
..
569b0a2
100644
(file)
--- 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);