---

yaml --- r: 347508 b: refs/heads/master c: 87f8e57 h: refs/heads/master v: v3
git-mirror · Dec 3, 2012 · 1839861 · 1839861
1 parent 4da77ed
commit 1839861
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a33977206cd167cb7541cf9044828552d9cae540
+refs/heads/master: 87f8e57327bd8d85fb5b46cad29ac281430cc50d
diff --git a/trunk/drivers/iommu/omap-iommu.c b/trunk/drivers/iommu/omap-iommu.c
@@ -154,7 +154,6 @@ static int iommu_enable(struct omap_iommu *obj)
 
 	err = arch_iommu->enable(obj);
 
-	clk_disable(obj->clk);
 	return err;
 }
 
@@ -163,8 +162,6 @@ static void iommu_disable(struct omap_iommu *obj)
 	if (!obj)
 		return;
 
-	clk_enable(obj->clk);
-
 	arch_iommu->disable(obj);
 
 	clk_disable(obj->clk);