From 7ec8ae956a796d3d42607b0ec1f21505effc8e89 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Sun, 23 Sep 2012 17:28:18 -0600
Subject: [PATCH] --- yaml --- r: 331295 b: refs/heads/master c:
 2b026d137b13047d01d426a61e2d50b5dcb58fd0 h: refs/heads/master i:   331293:
 bc26f71d9f9dc272fbdff075b975fa2e83b8a4c9   331291:
 fa4d7172249e44d0cc6505e6906e67615fcf4ea2   331287:
 b5222a6027eff50de4854d29f4af78177e7121f9   331279:
 b1c700869f46aeface2a6c5711ba746951fc9dbf   331263:
 c160b4aab23651039df575458b70a6bf56a786fa v: v3

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

diff --git a/[refs] b/[refs]
index 8469a5d927ee..fed4268642ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bb9fde2396b6cd205f404ef6d2aa46eb5b0af26
+refs/heads/master: 2b026d137b13047d01d426a61e2d50b5dcb58fd0
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index 5c8c5e0449b6..18a2df38265d 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -927,10 +927,10 @@ static void _am33xx_enable_module(struct omap_hwmod *oh)
  */
 static int _omap4_wait_target_disable(struct omap_hwmod *oh)
 {
-	if (!oh || !oh->clkdm)
+	if (!oh)
 		return -EINVAL;
 
-	if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
+	if (oh->_int_flags & _HWMOD_NO_MPU_PORT || !oh->clkdm)
 		return 0;
 
 	if (oh->flags & HWMOD_NO_IDLEST)
@@ -2635,10 +2635,10 @@ static int _omap2_wait_target_ready(struct omap_hwmod *oh)
  */
 static int _omap4_wait_target_ready(struct omap_hwmod *oh)
 {
-	if (!oh || !oh->clkdm)
+	if (!oh)
 		return -EINVAL;
 
-	if (oh->flags & HWMOD_NO_IDLEST)
+	if (oh->flags & HWMOD_NO_IDLEST || !oh->clkdm)
 		return 0;
 
 	if (!_find_mpu_rt_port(oh))