summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-08-01 18:51:46 +0200
committerVinod Koul <vinod.koul@intel.com>2014-08-07 21:52:27 +0530
commit6758ddafad55fc8e665bb03ff103d3e410483fe9 (patch)
tree9f6455b28f7d442029844b505fe03a30cb012520
parentcfc6abc3f1ee01dec27a6166f518f084544e4387 (diff)
downloadop-kernel-dev-6758ddafad55fc8e665bb03ff103d3e410483fe9.zip
op-kernel-dev-6758ddafad55fc8e665bb03ff103d3e410483fe9.tar.gz
dma: at_hdmac: fix invalid remaining bytes detection
Found using smatch: drivers/dma/at_hdmac.c:299 atc_get_bytes_left() warn: unsigned 'atchan->remain_desc' is never less than zero. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/at_hdmac.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index d20ab1b..ca9dd26 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -294,14 +294,16 @@ static int atc_get_bytes_left(struct dma_chan *chan)
ret = -EINVAL;
goto out;
}
- atchan->remain_desc -= (desc_cur->lli.ctrla & ATC_BTSIZE_MAX)
- << (desc_first->tx_width);
- if (atchan->remain_desc < 0) {
+
+ count = (desc_cur->lli.ctrla & ATC_BTSIZE_MAX)
+ << desc_first->tx_width;
+ if (atchan->remain_desc < count) {
ret = -EINVAL;
goto out;
- } else {
- ret = atchan->remain_desc;
}
+
+ atchan->remain_desc -= count;
+ ret = atchan->remain_desc;
} else {
/*
* Get residual bytes when current
OpenPOWER on IntegriCloud