Merge branch 'asoc-5.2' into asoc-5.3
[sfrench/cifs-2.6.git] / sound / soc / intel / boards / cht_bsw_rt5672.c
index 270d5705c5423426ec83dce1030e61d5366bb8f7..e03d52fe80a8fba566d3934bfa99cdc947084cb1 100644 (file)
@@ -435,6 +435,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
        }
 
        /* override plaform name, if required */
+       snd_soc_card_cht.dev = &pdev->dev;
        platform_name = mach->mach_params.platform;
 
        ret_val = snd_soc_fixup_dai_links_platform_name(&snd_soc_card_cht,
@@ -452,7 +453,6 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
        snd_soc_card_set_drvdata(&snd_soc_card_cht, drv);
 
        /* register the soc card */
-       snd_soc_card_cht.dev = &pdev->dev;
        ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht);
        if (ret_val) {
                dev_err(&pdev->dev,