aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2013-02-14 04:00:18 -0500
committerVinod Koul <vinod.koul@intel.com>2013-02-14 09:30:53 -0500
commit9b562639a1dbef847dfc9daa807bd3e7e02ef24f (patch)
treeea18c0b5399fbe544bda33047631ce848f3dd83c /drivers/dma
parent4168d0d9d304f184f786b1f00750557b8e09453c (diff)
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')
-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 aa384e53b7ac..671e75962370 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,
1147 enum dma_status ret; 1147 enum dma_status ret;
1148 1148
1149 ret = dma_cookie_status(chan, cookie, txstate); 1149 ret = dma_cookie_status(chan, cookie, txstate);
1150 /* FIXME: should be conditional on ret != DMA_SUCCESS? */ 1150 if (ret == DMA_SUCCESS)
1151 return ret;
1152
1151 dma_set_residue(txstate, coh901318_get_bytes_left(chan)); 1153 dma_set_residue(txstate, coh901318_get_bytes_left(chan));
1152 1154
1153 if (ret == DMA_IN_PROGRESS && cohc->stopped) 1155 if (ret == DMA_IN_PROGRESS && cohc->stopped)