---

yaml --- r: 81607 b: refs/heads/master c: 3c1c47e h: refs/heads/master i: 81605: ef9c2ae 81603: 88f065f 81599: ac1f82a v: v3
git-mirror · Jan 31, 2008 · 69acc66 · 69acc66
1 parent 7950088
commit 69acc66
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7a4ac86b4754f44eb06221f3087debb4775d588
+refs/heads/master: 3c1c47e0eb92264d555003ee2003f836e432615b
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
@@ -287,6 +287,14 @@ static void close_delayed_work(struct work_struct *work)
 		/* are we waiting on this codec DAI stream */
 		if (codec_dai->pop_wait == 1) {
 
+			/* power down the codec to D1 if no longer active */
+			if (codec->active == 0) {
+				dbg("pop wq D1 %s %s\n", codec->name,
+					codec_dai->playback.stream_name);
+				snd_soc_dapm_device_event(socdev,
+					SNDRV_CTL_POWER_D1);
+			}
+
 			codec_dai->pop_wait = 0;
 			snd_soc_dapm_stream_event(codec,
 				codec_dai->playback.stream_name,