---

yaml --- r: 258730 b: refs/heads/master c: 6481c73 h: refs/heads/master v: v3
git-mirror · Jul 10, 2011 · 422466b · 422466b
1 parent 4035709
commit 422466b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c614ebf6f73de8e6d0481c4b3b962b649166fee9
+refs/heads/master: 6481c73c22613660a5b791d2b4d0faf60508d731
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -1396,8 +1396,11 @@ static int _shutdown(struct omap_hwmod *oh)
 		}
 	}
 
-	if (oh->class->sysc)
+	if (oh->class->sysc) {
+		if (oh->_state == _HWMOD_STATE_IDLE)
+			_enable(oh);
 		_shutdown_sysc(oh);
+	}
 
 	/*
 	 * If an IP contains only one HW reset line, then assert it