---

yaml --- r: 196213 b: refs/heads/master c: f5c1f84 h: refs/heads/master i: 196211: acc95a2 v: v3
git-mirror · May 20, 2010 · d944e0c · d944e0c
1 parent 0255f52
commit d944e0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20383d82160d918047bb10a4f6e170f4bac195a7
+refs/heads/master: f5c1f84bcc9c5b7a664886d0a5e7143d0bc3251f
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/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;
 }
 
 /**