Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1492b4c authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Vinod Koul
Browse files

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: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent aebf5a67

drivers/dma/xgene-dma.c

+6 −3
Original line number Diff line number Diff line
@@ -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,