diff options
| author | Andrzej Hajda <a.hajda@samsung.com> | 2015-09-24 16:00:17 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-09-25 04:08:10 +0200 |
| commit | c1492b4c541e3a382b60f1b5879cd3c4d246ad31 (patch) | |
| tree | cf0d3d16eb291bc599b336e9dd47b717dd540f16 /drivers/dma/xgene-dma.c | |
| parent | dmaengine: pxa_dma: fix initial list move (diff) | |
| download | linux-c1492b4c541e3a382b60f1b5879cd3c4d246ad31.tar.xz linux-c1492b4c541e3a382b60f1b5879cd3c4d246ad31.zip | |
dmaengine: xgene-dma: fix handling xgene_dma_get_ring_size result
The function can return negative value.
The problem has been detected using proposed semantic patch
scripts/coccinelle/tests/assign_signed_to_unsigned.cocci [1].
[1]: http://permalink.gmane.org/gmane.linux.kernel/2046107
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/xgene-dma.c')
| -rw-r--r-- | drivers/dma/xgene-dma.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c index b23e8d52d126..4c5dddaad2d5 100644 --- a/drivers/dma/xgene-dma.c +++ b/drivers/dma/xgene-dma.c @@ -1421,15 +1421,18 @@ static int xgene_dma_create_ring_one(struct xgene_dma_chan *chan, struct xgene_dma_ring *ring, enum xgene_dma_ring_cfgsize cfgsize) { + int ret; + /* Setup DMA ring descriptor variables */ ring->pdma = chan->pdma; ring->cfgsize = cfgsize; ring->num = chan->pdma->ring_num++; ring->id = XGENE_DMA_RING_ID_GET(ring->owner, ring->buf_num); - ring->size = xgene_dma_get_ring_size(chan, cfgsize); - if (ring->size <= 0) - return ring->size; + ret = xgene_dma_get_ring_size(chan, cfgsize); + if (ret <= 0) + return ret; + ring->size = ret; /* Allocate memory for DMA ring descriptor */ ring->desc_vaddr = dma_zalloc_coherent(chan->dev, ring->size, |