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

Commit 14956156 authored by Yuanfang Zhang's avatar Yuanfang Zhang Committed by Gerrit - the friendly Code Review server
Browse files

coresight: tmc-etr: fix etr smmu unmap issue 



The return value 0 of dma_map_resource() is valid, so should use
the dma_mapping_error() to check for errors.

Change-Id: I368f480ed66bad0498e38da2fc6baa78b5935d7f
Signed-off-by: default avatarYuanfang Zhang <zhangyuanfang@codeaurora.org>
parent 0164a226

drivers/hwtracing/coresight/coresight-tmc-etr.c

+3 −3
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ static int tmc_etr_fill_usb_bam_data(struct tmc_drvdata *drvdata) 
		data_fifo_iova = dma_map_resource(drvdata->dev,

			bamdata->data_fifo.phys_base, bamdata->data_fifo.size,

			DMA_BIDIRECTIONAL, 0);

		if (!data_fifo_iova)

		if (dma_mapping_error(drvdata->dev, data_fifo_iova))

			return -ENOMEM;

		dev_dbg(drvdata->dev, "%s:data p_addr:%pa,iova:%pad,size:%x\n",

			__func__, &(bamdata->data_fifo.phys_base),
@@ -1074,7 +1074,7 @@ static int tmc_etr_fill_usb_bam_data(struct tmc_drvdata *drvdata) 
		desc_fifo_iova = dma_map_resource(drvdata->dev,

			bamdata->desc_fifo.phys_base, bamdata->desc_fifo.size,

			DMA_BIDIRECTIONAL, 0);

		if (!desc_fifo_iova)

		if (dma_mapping_error(drvdata->dev, desc_fifo_iova))

			return -ENOMEM;

		dev_dbg(drvdata->dev, "%s:desc p_addr:%pa,iova:%pad,size:%x\n",

			__func__, &(bamdata->desc_fifo.phys_base),
@@ -1146,7 +1146,7 @@ static int get_usb_bam_iova(struct device *dev, unsigned long usb_bam_handle, 
		return ret;

	}

	*iova = dma_map_resource(dev, p_addr, bam_size, DMA_BIDIRECTIONAL, 0);

	if (!(*iova))

	if (dma_mapping_error(dev, *iova))

		return -ENOMEM;

	return 0;

}