diff --git a/[refs] b/[refs]
index 6c650d520098..4d17cfc8a492 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5d1d036eadb30996184cc335c798219dd5922a9
+refs/heads/master: 5124e69e2b31f4ded7ed9ac47b18804b7847f677
diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h
index 9348bed86b1e..4f67e01f0e2c 100644
--- a/trunk/include/sound/soc.h
+++ b/trunk/include/sound/soc.h
@@ -643,6 +643,8 @@ struct snd_soc_codec_driver {
 	/* codec stream completion event */
 	int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
 
+	bool ignore_pmdown_time;  /* Doesn't benefit from pmdown delay */
+
 	/* probe ordering - for components with runtime dependencies */
 	int probe_order;
 	int remove_order;
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index a3a47cdaac8f..32dbcda5cb22 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -3312,6 +3312,7 @@ int snd_soc_register_codec(struct device *dev,
 	codec->volatile_register = codec_drv->volatile_register;
 	codec->readable_register = codec_drv->readable_register;
 	codec->writable_register = codec_drv->writable_register;
+	codec->ignore_pmdown_time = codec_drv->ignore_pmdown_time;
 	codec->dapm.bias_level = SND_SOC_BIAS_OFF;
 	codec->dapm.dev = dev;
 	codec->dapm.codec = codec;