---

yaml
---
r: 216847
b: refs/heads/master
c: 3827f94
h: refs/heads/master
i:
  216845: e5b0dff
  216843: 1fe8838
  216839: 1a4c998
  216831: 7516913
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ee9fff92e02e8c5f84794b3a5ce47646c2dfc39
+refs/heads/master: 3827f9492bdff045ae57fe67e65ce7e259ed4219

trunk/arch/arm/mach-omap2/omap_hwmod.c

@@ -982,9 +982,13 @@ static int _shutdown(struct omap_hwmod *oh)
 
 	if (oh->class->sysc)
 		_sysc_shutdown(oh);
-	_del_initiator_dep(oh, mpu_oh);
-	/* XXX what about the other system initiators here? DMA, tesla, d2d */
-	_disable_clocks(oh);
+
+	/* clocks and deps are already disabled in idle */
+	if (oh->_state == _HWMOD_STATE_ENABLED) {
+		_del_initiator_dep(oh, mpu_oh);
+		/* XXX what about the other system initiators here? dma, dsp */
+		_disable_clocks(oh);
+	}
 	/* XXX Should this code also force-disable the optional clocks? */
 
 	/* XXX mux any associated balls to safe mode */