From 69acc66492f5881c1b1e08227736081e31f802bd Mon Sep 17 00:00:00 2001
From: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Date: Thu, 10 Jan 2008 14:38:24 +0100
Subject: [PATCH] --- yaml --- r: 81607 b: refs/heads/master c:
 3c1c47e0eb92264d555003ee2003f836e432615b h: refs/heads/master i:   81605:
 ef9c2aeb3e0b69ef0bcdbb47f460f7334de48da9   81603:
 88f065fa58af46e8662e3276ecd70774007973f2   81599:
 ac1f82aedeef9e149bf26a344600f4a589c32297 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-core.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0577bafce87c..2edb0583f865 100644
--- 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
index e748b00466b7..7d51be8ee069 100644
--- 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,