On 2/16/2011 1:11 PM, Nayak, Rajendra wrote:
Add a hwmod state check in the _setup function
to avoid setting up hwmods' for which clock
lookup has failed.
Signed-off-by: Rajendra Nayak<rnayak@xxxxxx>
---
arch/arm/mach-omap2/omap_hwmod.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index e282e35..cd9dcde 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1362,6 +1362,12 @@ static int _setup(struct omap_hwmod *oh, void *data)
int i, r;
u8 postsetup_state;
+ if (oh->_state != _HWMOD_STATE_CLKS_INITED) {
+ WARN(1, "omap_hwmod: %s: _setup failed as one or more"
+ "clock lookups' have failed\n", oh->name);
Maybe a pr_warning will be enough for that?
+ return -EINVAL;
As discussed previously I'd prefer to return 0 here since we do not want
to break the iteration.
+ }
+
/* Set iclk autoidle mode */
if (oh->slaves_cnt> 0) {
for (i = 0; i< oh->slaves_cnt; i++) {
Otherwise it is fine for me.
Thanks,
Benoit
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
