2 files changed, 5 insertions, 1 deletions

diff --git a/include/sound/soc.h b/include/sound/soc.h
index e6a6d10de1d3..d9d88dd9720d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -521,6 +521,8 @@ struct snd_soc_card {
         int (*set_bias_level)(struct snd_soc_card *,
                               enum snd_soc_bias_level level);
 
+        int pmdown_time;
+
         /* CPU <--> Codec DAI links  */
         struct snd_soc_dai_link *dai_link;
         int num_links;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ca89c782132d..94b9cde26139 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -542,7 +542,7 @@ static int soc_codec_close(struct snd_pcm_substream *substream)
                 /* start delayed pop wq here for playback streams */
                 codec_dai->pop_wait = 1;
                 schedule_delayed_work(&card->delayed_work,
-                        msecs_to_jiffies(pmdown_time));
+                        msecs_to_jiffies(card->pmdown_time));
         } else {
                 /* capture streams can be powered down now */
                 snd_soc_dapm_stream_event(codec,
@@ -1039,6 +1039,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
         dev_dbg(card->dev, "All components present, instantiating\n");
 
         /* Found everything, bring it up */
+        card->pmdown_time = pmdown_time;
+
         if (card->probe) {
                 ret = card->probe(pdev);
                 if (ret < 0)