From: Simon <xxm@rock-chips.com>
Date: Fri, 15 May 2015 07:29:22 +0000 (+0800)
Subject: rk3368: iommu: remove hjc's commit
X-Git-Tag: firefly_0821_release~4158^2~71
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=551c61b2ce551a2a8fe2f2c52d9aeec0e951caf0;p=firefly-linux-kernel-4.4.55.git

rk3368: iommu: remove hjc's commit

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

diff --git a/drivers/iommu/rockchip-iovmm.c b/drivers/iommu/rockchip-iovmm.c
old mode 100755
new mode 100644
index d1100d6fcd24..b59bee54712b
--- a/drivers/iommu/rockchip-iovmm.c
+++ b/drivers/iommu/rockchip-iovmm.c
@@ -148,12 +148,9 @@ dma_addr_t rockchip_iovmm_map(struct device *dev,
 	spin_unlock(&vmm->lock);
 
 	ret = rockchip_iommu_tlb_invalidate(dev);
-	if (ret) {
-		spin_lock(&vmm->lock);
-		list_del(&region->node);
-		spin_unlock(&vmm->lock);
+	if (ret)
 		goto err_map_map;
-	}
+
 	dev_dbg(dev->archdata.iommu, "IOVMM: Allocated VM region @ %p/%#X bytes.\n",
 	&region->start, region->size);