iommu/arm-smmu: Return 0 on unmap failure

Laurent Pinchart · wildea01 · commit 16c50dcfc4c1 · 2014-04-15T12:19:33.000+01:00
The IOMMU core expects the unmap operation to return the number of bytes
that have been unmapped or 0 on failure, a negative return value being
treated like a number of bytes.

Signed-off-by: Laurent Pinchart &lt;laurent.pinchart+renesas@ideasonboard.com&gt;
Signed-off-by: Will Deacon &lt;will.deacon@arm.com&gt;
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
@@ -1499,7 +1499,7 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
 
 	ret = arm_smmu_handle_mapping(smmu_domain, iova, 0, size, 0);
 	arm_smmu_tlb_inv_context(&smmu_domain->root_cfg);
-	return ret ? ret : size;
+	return ret ? 0 : size;
 }
 
 static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,

Original file line number	Diff line number	Diff line change
`@@ -1499,7 +1499,7 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,`
`1499`	`1499`
`1500`	`1500`	`ret = arm_smmu_handle_mapping(smmu_domain, iova, 0, size, 0);`
`1501`	`1501`	`arm_smmu_tlb_inv_context(&smmu_domain->root_cfg);`
`1502`		`- return ret ? ret : size;`
	`1502`	`+ return ret ? 0 : size;`
`1503`	`1503`	`}`
`1504`	`1504`
`1505`	`1505`	`static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,`