diff options
| author | Mark Brown <broonie@kernel.org> | 2024-04-29 18:15:57 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-04-29 18:15:57 +0300 |
| commit | 9b4f41684b239eedac96913270db4a5669956671 (patch) | |
| tree | cb9b4800c3d6b93bc4af31fa3e377933c68f9bb2 /sound/soc/ti | |
| parent | 2da01ca3674c6e90dbeeda02168849e2ec877edc (diff) | |
| parent | bda16500dd0b05e2e047093b36cbe0873c95aeae (diff) | |
| download | linux-9b4f41684b239eedac96913270db4a5669956671.tar.xz | |
ASoC: Merge up fixes
Some new SOF changes depend on the fixes there.
Diffstat (limited to 'sound/soc/ti')
| -rw-r--r-- | sound/soc/ti/davinci-mcasp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index b892d66f7847..1e760c315521 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -2417,12 +2417,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev) mcasp_reparent_fck(pdev); - ret = devm_snd_soc_register_component(&pdev->dev, &davinci_mcasp_component, - &davinci_mcasp_dai[mcasp->op_mode], 1); - - if (ret != 0) - goto err; - ret = davinci_mcasp_get_dma_type(mcasp); switch (ret) { case PCM_EDMA: @@ -2449,6 +2443,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev) goto err; } + ret = devm_snd_soc_register_component(&pdev->dev, &davinci_mcasp_component, + &davinci_mcasp_dai[mcasp->op_mode], 1); + + if (ret != 0) + goto err; + no_audio: ret = davinci_mcasp_init_gpiochip(mcasp); if (ret) { |