From: Misael Lopez Cruz <misael.lopez@ti.com>
Date: Mon, 3 Sep 2012 17:50:52 +0000 (-0600)
Subject: ARM: OMAP: hwmod code: Disable module when hwmod enable fails
X-Git-Tag: firefly_0821_release~3680^2~2102^2~1^2^2^3~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=471a009b6db7670299a8674cd7fb2557c8c2797f;p=firefly-linux-kernel-4.4.55.git

ARM: OMAP: hwmod code: Disable module when hwmod enable fails

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 <misael.lopez@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 6ca8e519968d..37afbd173c2c 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/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);