aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/xgene-dma.c9
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,
1421 struct xgene_dma_ring *ring, 1421 struct xgene_dma_ring *ring,
1422 enum xgene_dma_ring_cfgsize cfgsize) 1422 enum xgene_dma_ring_cfgsize cfgsize)
1423{ 1423{
1424 int ret;
1425
1424 /* Setup DMA ring descriptor variables */ 1426 /* Setup DMA ring descriptor variables */
1425 ring->pdma = chan->pdma; 1427 ring->pdma = chan->pdma;
1426 ring->cfgsize = cfgsize; 1428 ring->cfgsize = cfgsize;
1427 ring->num = chan->pdma->ring_num++; 1429 ring->num = chan->pdma->ring_num++;
1428 ring->id = XGENE_DMA_RING_ID_GET(ring->owner, ring->buf_num); 1430 ring->id = XGENE_DMA_RING_ID_GET(ring->owner, ring->buf_num);
1429 1431
1430 ring->size = xgene_dma_get_ring_size(chan, cfgsize); 1432 ret = xgene_dma_get_ring_size(chan, cfgsize);
1431 if (ring->size <= 0) 1433 if (ret <= 0)
1432 return ring->size; 1434 return ret;
1435 ring->size = ret;
1433 1436
1434 /* Allocate memory for DMA ring descriptor */ 1437 /* Allocate memory for DMA ring descriptor */
1435 ring->desc_vaddr = dma_zalloc_coherent(chan->dev, ring->size, 1438 ring->desc_vaddr = dma_zalloc_coherent(chan->dev, ring->size,