1 files changed, 11 insertions, 4 deletions

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8eb0f0711f8..ee15337353f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -319,10 +319,17 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
         cpu_dai->runtime = NULL;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                /* start delayed pop wq here for playback streams */
-                codec_dai->pop_wait = 1;
-                schedule_delayed_work(&rtd->delayed_work,
-                        msecs_to_jiffies(rtd->pmdown_time));
+                if (unlikely(codec->ignore_pmdown_time)) {
+                        /* powered down playback stream now */
+                        snd_soc_dapm_stream_event(rtd,
+                                codec_dai->driver->playback.stream_name,
+                                SND_SOC_DAPM_STREAM_STOP);
+                } else {
+                        /* start delayed pop wq here for playback streams */
+                        codec_dai->pop_wait = 1;
+                        schedule_delayed_work(&rtd->delayed_work,
+                                msecs_to_jiffies(rtd->pmdown_time));
+                }
         } else {
                 /* capture streams can be powered down now */
                 snd_soc_dapm_stream_event(rtd,