summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-09 16:25:10 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-09 16:25:09 -0800
commit05a0fa2b206786b5bed2bc7098acd82cae63334d (patch)
tree236493d5e8de0b5e274813752df2c1dc7f76eae0
parentd9a9a205a91ee481b9ad921e0ea1a2a69b9fa327 (diff)
parentfdce886479b154e5b3b35a4cb67ce140f44aba03 (diff)
Merge "dma-mapping: use iommu_unmap for unmapping address"
-rw-r--r--arch/arm/mm/dma-mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 52486c0e6598..369fca73a9ab 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1818,7 +1818,7 @@ void arm_iommu_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
total_length = PAGE_ALIGN((iova & ~PAGE_MASK) + total_length);
iova &= PAGE_MASK;
- iommu_unmap_range(mapping->domain, iova, total_length);
+ iommu_unmap(mapping->domain, iova, total_length);
__free_iova(mapping, iova, total_length);
}