Merge branch 'v5.7' into v5.7

This commit is contained in:
Hin-Tak Leung 2020-08-05 06:26:08 +01:00
commit 131ee8187d

View file

@ -645,12 +645,12 @@ static int seeed_voice_card_probe(struct platform_device *pdev)
* simple-card-utils.c :: asoc_simple_canonicalize_platform() * simple-card-utils.c :: asoc_simple_canonicalize_platform()
*/ */
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
dai_link[i].cpus = &dai_props[i].cpus; dai_link[i].cpus = &dai_props[i].cpus;
dai_link[i].num_cpus = 1; dai_link[i].num_cpus = 1;
dai_link[i].codecs = &dai_props[i].codecs; dai_link[i].codecs = &dai_props[i].codecs;
dai_link[i].num_codecs = 1; dai_link[i].num_codecs = 1;
dai_link[i].platforms = &dai_props[i].platforms; dai_link[i].platforms = &dai_props[i].platforms;
dai_link[i].num_platforms = 1; dai_link[i].num_platforms = 1;
} }
priv->dai_props = dai_props; priv->dai_props = dai_props;