---

yaml --- r: 339807 b: refs/heads/master c: 2577a4a h: refs/heads/master i: 339805: ba6eb29 339803: 701068e 339799: 7e36194 339791: b6bf03c 339775: 9dce7e5 v: v3
git-mirror · Nov 8, 2012 · 63bf799 · 63bf799
1 parent d2d65dc
commit 63bf799
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b13159afb46f8a528fcf30bac26c07dbb40a784a
+refs/heads/master: 2577a4a6096017f3152339c562ada77e182c8976
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -2062,7 +2062,8 @@ static int _enable(struct omap_hwmod *oh)
 			_enable_sysc(oh);
 		}
 	} else {
-		_omap4_disable_module(oh);
+		if (soc_ops.disable_module)
+			soc_ops.disable_module(oh);
 		_disable_clocks(oh);
 		pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n",
 			 oh->name, r);