[PATCH] ARM: OMAP: hwmod: Disable module when hwmod enable fails

From: Misael Lopez Cruz <redacted>

Clock and module mode are explictly enable when hwmod is enabled. But if
the hwmod doesn't get ready on time, clocks are disabled but module is left
enabled.

Signed-off-by: Misael Lopez Cruz <redacted>
Signed-off-by: Rajendra Nayak <redacted>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <redacted>
---
 arch/arm/mach-omap2/omap_hwmod.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 7731936..26888b6 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c

@@ -1834,6 +1834,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);

-- 
1.7.1

On Fri, 6 Jul 2012, Rajendra Nayak wrote:

From: Misael Lopez Cruz <redacted>

Clock and module mode are explictly enable when hwmod is enabled. But if
the hwmod doesn't get ready on time, clocks are disabled but module is left
enabled.

Signed-off-by: Misael Lopez Cruz <redacted>
Signed-off-by: Rajendra Nayak <redacted>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <redacted>

Thanks, queued for 3.6-rc.

- Paul