From ea4c30b4c60c073c673c3db7efd9fea821bcd798 Mon Sep 17 00:00:00 2001
From: Shiraz Hashim <shiraz.hashim@st.com>
Date: Fri, 9 Nov 2012 15:26:29 +0000
Subject: [PATCH] --- yaml --- r: 358490 b: refs/heads/master c:
 5e034f7b659be9d94e64aaaa985ab530dd847fdb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6c08e75e5534..ebb7148b6411 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c1119bdd650fa58dad8157bc75c5fcf6ed97843
+refs/heads/master: 5e034f7b659be9d94e64aaaa985ab530dd847fdb
diff --git a/trunk/drivers/dma/dmatest.c b/trunk/drivers/dma/dmatest.c
index 99a75e5d66be..a2c8904b63ea 100644
--- a/trunk/drivers/dma/dmatest.c
+++ b/trunk/drivers/dma/dmatest.c
@@ -536,7 +536,9 @@ static int dmatest_func(void *data)
 			thread_name, total_tests, failed_tests, ret);
 
 	/* terminate all transfers on specified channels */
-	dmaengine_terminate_all(chan);
+	if (ret)
+		dmaengine_terminate_all(chan);
+
 	if (iterations > 0)
 		while (!kthread_should_stop()) {
 			DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait_dmatest_exit);