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

Commit 8b50dcf5 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: dma-mapping: use correct type for iova in arm_iommu_unmap_sg" into msm-4.8

parents 8aa6b7de 62a8bc20
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1731,7 +1731,7 @@ void arm_iommu_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
{
	struct dma_iommu_mapping *mapping = dev->archdata.mapping;
	unsigned int total_length = sg_dma_len(sg);
	unsigned int iova = sg_dma_address(sg);
	dma_addr_t iova = sg_dma_address(sg);

	total_length = PAGE_ALIGN((iova & ~PAGE_MASK) + total_length);
	iova &= PAGE_MASK;