From 4123b206625533232c6de4a0efe0e4282de175f8 Mon Sep 17 00:00:00 2001
From: Rajendra Nayak <rnayak@ti.com>
Date: Tue, 21 Dec 2010 21:31:28 -0700
Subject: [PATCH] --- yaml --- r: 226640 b: refs/heads/master c:
 f2dd7e09db3e18e4c053810b72fe026685d9bf0c h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-omap2/omap_hwmod.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 70a94c055a13..adcbb2bf5e44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce35b2446945c506cb02960eab2072f56efdf1c0
+refs/heads/master: f2dd7e09db3e18e4c053810b72fe026685d9bf0c
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index 91b011e3a7cb..c576121b58a9 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -1233,6 +1233,7 @@ static int _enable(struct omap_hwmod *oh)
 			_enable_sysc(oh);
 		}
 	} else {
+		_disable_clocks(oh);
 		pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n",
 			 oh->name, r);
 	}