From 551c61b2ce551a2a8fe2f2c52d9aeec0e951caf0 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 15 May 2015 15:29:22 +0800 Subject: [PATCH] rk3368: iommu: remove hjc's commit Signed-off-by: Simon --- drivers/iommu/rockchip-iovmm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) mode change 100755 => 100644 drivers/iommu/rockchip-iovmm.c 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(®ion->node); - spin_unlock(&vmm->lock); + if (ret) goto err_map_map; - } + dev_dbg(dev->archdata.iommu, "IOVMM: Allocated VM region @ %p/%#X bytes.\n", ®ion->start, region->size); -- 2.34.1