From 17f94169fa33b64641e853d648f8caa03d9baed5 Mon Sep 17 00:00:00 2001
From: Javier Martin <javier.martin@vista-silicon.com>
Date: Tue, 30 Oct 2012 15:58:50 +0000
Subject: [PATCH] --- yaml --- r: 349067 b: refs/heads/master c:
 bef2a8d3f6cb91bc8743bdd63d3eb6a37bf27b12 h: refs/heads/master i:   349065:
 124e0c0b6f757915c4ac6de4900dd382a63980c9   349063:
 a2ef2b24d89178bf53264a68e980947ca4039c53 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/dma/imx-dma.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9e17c14f26e0..497daa07035d 100644
--- 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
index dbf0e6f8de8a..a7dcf78b1ff8 100644
--- 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;