From 607015ce3c7d697ff7f2fc5daf722e42daf3c87a Mon Sep 17 00:00:00 2001
From: Misael Lopez Cruz <misael.lopez@ti.com>
Date: Mon, 3 Sep 2012 11:50:52 -0600
Subject: [PATCH] --- yaml --- r: 322653 b: refs/heads/master c:
 471a009b6db7670299a8674cd7fb2557c8c2797f h: refs/heads/master i:   322651:
 76bf1ef87db30d0a9dae7e336a0d1b192127a811 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 39d6c8aa4ab9..7d754f3656e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed733619d85262439f625cc9d8b00cdaae761070
+refs/heads/master: 471a009b6db7670299a8674cd7fb2557c8c2797f
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index 6ca8e519968d..37afbd173c2c 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -1889,6 +1889,7 @@ static int _enable(struct omap_hwmod *oh)
 			_enable_sysc(oh);
 		}
 	} else {
+		_omap4_disable_module(oh);
 		_disable_clocks(oh);
 		pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n",
 			 oh->name, r);