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

Commit e4fb1eac 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" into msm-4.8

parents cc430cd2 38f66a4d

arch/arm64/mm/dma-mapping.c

+2 −1
Original line number Diff line number Diff line
@@ -1659,7 +1659,8 @@ int arm_iommu_map_sg(struct device *dev, struct scatterlist *sg, 
	struct scatterlist *s;

	int ret, i;

	struct dma_iommu_mapping *mapping = dev->archdata.mapping;

	unsigned int iova, total_length = 0, current_offset = 0;

	unsigned int total_length = 0, current_offset = 0;

	dma_addr_t iova;

	int prot = __dma_direction_to_prot(dir);



	for_each_sg(sg, s, nents, i)