Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / intel / boards / bytcr_rt5640.c

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index ed9fa17287227078b9f00fc642aede73da960f67..fb9d9e271845daae00b9afad7a17c24a91387d9b 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1413,7 +1413,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd,
        ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
                                  SND_SOC_DAIFMT_I2S     |
                                  SND_SOC_DAIFMT_NB_NF   |
-                                 SND_SOC_DAIFMT_CBC_CFC);
+                                 SND_SOC_DAIFMT_BP_FP);
        if (ret < 0) {
                dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
                return ret;
@@ -1636,7 +1636,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
                 * with the codec driver/pdata are non-existent
                 */
 
-               struct acpi_chan_package chan_package;
+               struct acpi_chan_package chan_package = { 0 };
 
                /* format specified: 2 64-bit integers */
                struct acpi_buffer format = {sizeof("NN"), "NN"};