From 1839861df34a22c3636156c4eb67d9dc1d74d833 Mon Sep 17 00:00:00 2001
From: Omar Ramirez Luna <omar.luna@linaro.org>
Date: Mon, 19 Nov 2012 19:05:49 -0600
Subject: [PATCH] --- yaml --- r: 347508 b: refs/heads/master c:
 87f8e57327bd8d85fb5b46cad29ac281430cc50d h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/iommu/omap-iommu.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cfbd2cf5c923..28388439b52b 100644
--- 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
index 6b1288cddaef..f8082da6179b 100644
--- 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);