1 files changed, 3 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 5d3a3ea37422..b624ad648212 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -783,9 +783,10 @@ static int _init_clocks(struct omap_hwmod *oh)
         ret |= _init_interface_clks(oh);
         ret |= _init_opt_clks(oh);
 
-        oh->_state = _HWMOD_STATE_CLKS_INITED;
+        if (!ret)
+                oh->_state = _HWMOD_STATE_CLKS_INITED;
 
-        return ret;
+        return 0;
 }
 
 /**