Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / sound / soc / codecs / hdmi.c

diff --git a/sound/soc/codecs/hdmi.c b/sound/soc/codecs/hdmi.c
index 73d07b4..bd42ad3 100644 (file)
--- a/sound/soc/codecs/hdmi.c
+++ b/sound/soc/codecs/hdmi.c
@@ -47,6 +47,7 @@ static struct snd_soc_dai_driver hdmi_codec_dai = {
                        SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
                .formats = SNDRV_PCM_FMTBIT_S16_LE |
                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,
+               .sig_bits = 24,
        },
        .capture = {
                .stream_name = "Capture",
@@ -75,6 +76,7 @@ static struct snd_soc_codec_driver hdmi_codec = {
        .num_dapm_widgets = ARRAY_SIZE(hdmi_widgets),
        .dapm_routes = hdmi_routes,
        .num_dapm_routes = ARRAY_SIZE(hdmi_routes),
+       .ignore_pmdown_time = true,
 };
 
 static int hdmi_codec_probe(struct platform_device *pdev)