summaryrefslogtreecommitdiffstats
path: root/drivers/dma/coh901318.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2013-02-14 11:00:18 +0200
committerVinod Koul <vinod.koul@intel.com>2013-02-14 20:00:53 +0530
commit9b562639a1dbef847dfc9daa807bd3e7e02ef24f (patch)
treeea18c0b5399fbe544bda33047631ce848f3dd83c /drivers/dma/coh901318.c
parent4168d0d9d304f184f786b1f00750557b8e09453c (diff)
downloadop-kernel-dev-9b562639a1dbef847dfc9daa807bd3e7e02ef24f.zip
op-kernel-dev-9b562639a1dbef847dfc9daa807bd3e7e02ef24f.tar.gz
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>
Diffstat (limited to 'drivers/dma/coh901318.c')
-rw-r--r--drivers/dma/coh901318.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index aa384e5..671e759 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)
OpenPOWER on IntegriCloud