From: Simon <xxm@rock-chips.com>
Date: Mon, 25 May 2015 03:48:31 +0000 (+0800)
Subject: rk3368: iommu: fix region free position when iovmm_activate failed
X-Git-Tag: firefly_0821_release~4118
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b27f65bf60885fcd2849a65d26379f2989d8bc1;p=firefly-linux-kernel-4.4.55.git

rk3368: iommu: fix region free position when iovmm_activate failed

Signed-off-by: Simon <xxm@rock-chips.com>
---

diff --git a/drivers/iommu/rockchip-iovmm.c b/drivers/iommu/rockchip-iovmm.c
index b59bee54712b..595b75c23d04 100644
--- a/drivers/iommu/rockchip-iovmm.c
+++ b/drivers/iommu/rockchip-iovmm.c
@@ -148,18 +148,18 @@ dma_addr_t rockchip_iovmm_map(struct device *dev,
 	spin_unlock(&vmm->lock);
 
 	ret = rockchip_iommu_tlb_invalidate(dev);
-	if (ret)
+	if (ret) {
+		spin_lock(&vmm->lock);
+		list_del(&region->node);
+		spin_unlock(&vmm->lock);
 		goto err_map_map;
-
+	}
 	dev_dbg(dev->archdata.iommu, "IOVMM: Allocated VM region @ %p/%#X bytes.\n",
 	&region->start, region->size);
 
 	return region->start;
 
 err_map_map:
-	spin_lock(&vmm->lock);
-	list_del(&region->node);
-	spin_unlock(&vmm->lock);
 	iommu_unmap(vmm->domain, start, mapped_size);
 	gen_pool_free(vmm->vmm_pool, start, size);
 err_map_noiomem: