From: Simon <xxm@rock-chips.com>
Date: Fri, 17 Apr 2015 06:27:47 +0000 (+0800)
Subject: rk3368: iommu: delete region list if map failed
X-Git-Tag: firefly_0821_release~4158^2~73
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9a16e83fe9ad16fc8312a46d429e3d62849b189e;p=firefly-linux-kernel-4.4.55.git

rk3368: iommu: delete region list if map failed

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

diff --git a/drivers/iommu/rockchip-iovmm.c b/drivers/iommu/rockchip-iovmm.c
index c83573edaa41..d1100d6fcd24 100755
--- a/drivers/iommu/rockchip-iovmm.c
+++ b/drivers/iommu/rockchip-iovmm.c
@@ -156,10 +156,13 @@ dma_addr_t rockchip_iovmm_map(struct device *dev,
 	}
 	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: