---

yaml --- r: 349067 b: refs/heads/master c: bef2a8d h: refs/heads/master i: 349065: 124e0c0 349063: a2ef2b2 v: v3
git-mirror · Jan 8, 2013 · 17f9416 · 17f9416
1 parent 00727bc
commit 17f9416
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac4989874af56435c308bdde9ad9c837a26f8b23
+refs/heads/master: bef2a8d3f6cb91bc8743bdd63d3eb6a37bf27b12
diff --git a/trunk/drivers/dma/imx-dma.c b/trunk/drivers/dma/imx-dma.c
@@ -684,9 +684,8 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 			break;
 		}
 
-		imxdmac->hw_chaining = 1;
-		if (!imxdma_hw_chain(imxdmac))
-			return -EINVAL;
+		imxdmac->hw_chaining = 0;
+
 		imxdmac->ccr_from_device = (mode | IMX_DMA_TYPE_FIFO) |
 			((IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR) << 2) |
 			CCR_REN;