From 422466b16c9ee714ebb21148cacdfbb4c268c15f Mon Sep 17 00:00:00 2001
From: Miguel Vadillo <vadillo@ti.com>
Date: Fri, 1 Jul 2011 22:54:02 +0200
Subject: [PATCH] --- yaml --- r: 258730 b: refs/heads/master c:
 6481c73c22613660a5b791d2b4d0faf60508d731 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5f18c4f12ac0..16e5b284b0b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c614ebf6f73de8e6d0481c4b3b962b649166fee9
+refs/heads/master: 6481c73c22613660a5b791d2b4d0faf60508d731
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index 384d3c3ec36d..cbc2a8a4ce39 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -1396,8 +1396,11 @@ static int _shutdown(struct omap_hwmod *oh)
 		}
 	}
 
-	if (oh->class->sysc)
+	if (oh->class->sysc) {
+		if (oh->_state == _HWMOD_STATE_IDLE)
+			_enable(oh);
 		_shutdown_sysc(oh);
+	}
 
 	/*
 	 * If an IP contains only one HW reset line, then assert it