diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-08-01 08:11:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-08-01 08:11:19 +0200 |
| commit | 9769e44d41a1359b9000ff8458f0f2f66080ebf4 (patch) | |
| tree | e91d2d71fd469c2fa9289fed87f0bb4fded196a5 /sound/soc/intel/boards/bytcr_rt5651.c | |
| parent | f38e6458e16df7bac3871f4e69f9681c0b3c58bd (diff) | |
| parent | be561ffad708f0cee18aee4231f80ffafaf7a419 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/intel/boards/bytcr_rt5651.c')
| -rw-r--r-- | sound/soc/intel/boards/bytcr_rt5651.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index d467fcaa48ea..2beb686768f2 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -706,7 +706,7 @@ static int byt_rt5651_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) { @@ -952,7 +952,7 @@ static int snd_byt_rt5651_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"}; |