projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f24f43
)
rk3368: iommu: remove hjc's commit
author
Simon
<xxm@rock-chips.com>
Fri, 15 May 2015 07:29:22 +0000
(15:29 +0800)
committer
Simon
<xxm@rock-chips.com>
Fri, 15 May 2015 07:29:22 +0000
(15:29 +0800)
Signed-off-by: Simon <xxm@rock-chips.com>
drivers/iommu/rockchip-iovmm.c
[changed mode: 0755->0644]
patch
|
blob
|
history
diff --git
a/drivers/iommu/rockchip-iovmm.c
b/drivers/iommu/rockchip-iovmm.c
old mode 100755
(executable)
new mode 100644
(file)
index
d1100d6
..
b59bee5
--- 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);