From 03c563a560def62aaceaf739aa335dd062db92ce Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 8 Feb 2012 20:10:56 +0000
Subject: [PATCH] --- yaml --- r: 293313 b: refs/heads/master c:
 b5d1d036eadb30996184cc335c798219dd5922a9 h: refs/heads/master i:   293311:
 107d1582895297d9fdae58b300efe0e5128e45e7 v: v3

---
 [refs]                    | 2 +-
 trunk/sound/soc/soc-pcm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a554db6ac3fa..6c650d520098 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c6c0b5eee572a24345fdd1fac6aa670cc937a3a
+refs/heads/master: b5d1d036eadb30996184cc335c798219dd5922a9
diff --git a/trunk/sound/soc/soc-pcm.c b/trunk/sound/soc/soc-pcm.c
index 121318defea3..15816eccad34 100644
--- a/trunk/sound/soc/soc-pcm.c
+++ b/trunk/sound/soc/soc-pcm.c
@@ -369,7 +369,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
 	cpu_dai->runtime = NULL;
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		if (codec->ignore_pmdown_time ||
+		if (!rtd->pmdown_time || codec->ignore_pmdown_time ||
 		    rtd->dai_link->ignore_pmdown_time) {
 			/* powered down playback stream now */
 			snd_soc_dapm_stream_event(rtd,