From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Thu, 14 Feb 2013 09:00:18 +0000 (+0200)
Subject: dma: coh901318: set residue only if dma is in progress
X-Git-Tag: v3.9-rc1~80^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9b562639a1dbef847dfc9daa807bd3e7e02ef24f;p=~emulex%2Finfiniband.git

dma: coh901318: set residue only if dma is in progress

When status is DMA_SUCCESS the residue should be zero. Otherwise it's a bug.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index aa384e53b7a..671e7596237 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -1147,7 +1147,9 @@ coh901318_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
 	enum dma_status ret;
 
 	ret = dma_cookie_status(chan, cookie, txstate);
-	/* FIXME: should be conditional on ret != DMA_SUCCESS? */
+	if (ret == DMA_SUCCESS)
+		return ret;
+
 	dma_set_residue(txstate, coh901318_get_bytes_left(chan));
 
 	if (ret == DMA_IN_PROGRESS && cohc->stopped)