summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/omap-iovmm.c
diff options
context:
space:
mode:
authorOhad Ben-Cohen2011-09-02 19:32:33 +0200
committerJoerg Roedel2011-09-05 15:14:37 +0200
commit5e1b612cb16f446996398bd23b6cd59ea0206938 (patch)
tree4278a81d31facf01da8d914bcd90e9573824fc32 /drivers/iommu/omap-iovmm.c
parentiommu/omap: cleanup: remove a redundant statement (diff)
downloadkernel-qcow2-linux-5e1b612cb16f446996398bd23b6cd59ea0206938.tar.gz
kernel-qcow2-linux-5e1b612cb16f446996398bd23b6cd59ea0206938.tar.xz
kernel-qcow2-linux-5e1b612cb16f446996398bd23b6cd59ea0206938.zip
iommu/omap: ->unmap() should return order of unmapped page
Users of the IOMMU API (kvm specifically) assume that iommu_unmap() returns the order of the unmapped page. Fix omap_iommu_unmap() to do so and adopt omap-iovmm accordingly. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/iommu/omap-iovmm.c')
-rw-r--r--drivers/iommu/omap-iovmm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c
index 39bdb92aa96f..e8fdb8830f69 100644
--- a/drivers/iommu/omap-iovmm.c
+++ b/drivers/iommu/omap-iovmm.c
@@ -480,7 +480,7 @@ static void unmap_iovm_area(struct iommu_domain *domain, struct omap_iommu *obj,
order = get_order(bytes);
err = iommu_unmap(domain, start, order);
- if (err)
+ if (err < 0)
break;
dev_dbg(obj->dev, "%s: unmap %08x(%x) %08x\n",