diff --git a/[refs] b/[refs]
index 70ff66a53e7f..c4daca60e5da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c173d15f99ef182ac4b27e3e03779026d8e6cf1
+refs/heads/master: e50fad4f029c36ed85a71fe7413684cfd3c7d78c
diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h
index 11cfb5953e06..877fcc1e0167 100644
--- a/trunk/include/sound/soc.h
+++ b/trunk/include/sound/soc.h
@@ -718,6 +718,9 @@ struct snd_soc_dai_link {
 	/* Symmetry requirements */
 	unsigned int symmetric_rates:1;
 
+	/* pmdown_time is ignored at stop */
+	unsigned int ignore_pmdown_time:1;
+
 	/* codec/machine specific init - e.g. add machine controls */
 	int (*init)(struct snd_soc_pcm_runtime *rtd);
 
diff --git a/trunk/sound/soc/soc-pcm.c b/trunk/sound/soc/soc-pcm.c
index ee15337353fa..52a7259f6184 100644
--- a/trunk/sound/soc/soc-pcm.c
+++ b/trunk/sound/soc/soc-pcm.c
@@ -319,7 +319,8 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
 	cpu_dai->runtime = NULL;
 
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		if (unlikely(codec->ignore_pmdown_time)) {
+		if (unlikely(codec->ignore_pmdown_time ||
+			rtd->dai_link->ignore_pmdown_time)) {
 			/* powered down playback stream now */
 			snd_soc_dapm_stream_event(rtd,
 				codec_dai->driver->playback.stream_name,