diff options
| author | Mark Brown | 2016-10-28 19:33:24 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-10-28 19:33:24 +0200 |
| commit | 990fcfefc925a959e204a44fc479efcc236ebced (patch) | |
| tree | 207452dfd2502b216c568e75c65583fdf43a9e81 /sound/soc/samsung/i2s.c | |
| parent | ASoC: samsung: s3c24xx-i2s: Debug/error trace cleanup (diff) | |
| parent | ASoC: samsung: get access to DMA engine early to defer probe properly (diff) | |
| download | kernel-qcow2-linux-990fcfefc925a959e204a44fc479efcc236ebced.tar.gz kernel-qcow2-linux-990fcfefc925a959e204a44fc479efcc236ebced.tar.xz kernel-qcow2-linux-990fcfefc925a959e204a44fc479efcc236ebced.zip | |
Merge branch 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
Diffstat (limited to 'sound/soc/samsung/i2s.c')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index e06aa3152ab0..e00974bc5616 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1238,14 +1238,14 @@ static int samsung_i2s_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Unable to get drvdata\n"); return -EFAULT; } - ret = devm_snd_soc_register_component(&sec_dai->pdev->dev, - &samsung_i2s_component, - &sec_dai->i2s_dai_drv, 1); + ret = samsung_asoc_dma_platform_register(&pdev->dev, + sec_dai->filter, "tx-sec", NULL); if (ret != 0) return ret; - return samsung_asoc_dma_platform_register(&pdev->dev, - sec_dai->filter, "tx-sec", NULL); + return devm_snd_soc_register_component(&sec_dai->pdev->dev, + &samsung_i2s_component, + &sec_dai->i2s_dai_drv, 1); } pri_dai = i2s_alloc_dai(pdev, false); @@ -1313,6 +1313,11 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (quirks & QUIRK_PRI_6CHAN) pri_dai->i2s_dai_drv.playback.channels_max = 6; + ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter, + NULL, NULL); + if (ret < 0) + goto err_disable_clk; + if (quirks & QUIRK_SEC_DAI) { sec_dai = i2s_alloc_dai(pdev, true); if (!sec_dai) { @@ -1351,10 +1356,6 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (ret < 0) goto err_free_dai; - ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter, - NULL, NULL); - if (ret < 0) - goto err_free_dai; pm_runtime_enable(&pdev->dev); |