diff options
| author |   Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2014-02-28 15:37:10 +0000 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2014-04-15 12:19:33 +0100 |
| commit | 16c50dcfc4c186ed09a4d80fbd511492d024a1c5 (patch) | |
| tree | a3a7fb799c35082d7105e71a4d189ae63a4caa47 /drivers/iommu | |
| parent | Linux 3.15-rc1 (diff) | |
| download | linux-dev-16c50dcfc4c186ed09a4d80fbd511492d024a1c5.tar.xz linux-dev-16c50dcfc4c186ed09a4d80fbd511492d024a1c5.zip | |
iommu/arm-smmu: Return 0 on unmap failure
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 <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 8b89e33a89fe..69d001a71b22 100644 --- 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, |