diff options
| author | Mark Brown <broonie@kernel.org> | 2016-10-28 20:33:24 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-28 20:33:24 +0300 |
| commit | 990fcfefc925a959e204a44fc479efcc236ebced (patch) | |
| tree | 207452dfd2502b216c568e75c65583fdf43a9e81 /sound/soc/samsung/s3c24xx-i2s.c | |
| parent | 2ef9555bd13d00c63fdbe3cdca6ab0e2ded42695 (diff) | |
| parent | 73f5dfc68316bef2ab7062ecdefd4b0ca941b4c1 (diff) | |
| download | linux-990fcfefc925a959e204a44fc479efcc236ebced.tar.xz | |
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/s3c24xx-i2s.c')
| -rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 7c7061bc0ded..3b4bef9025a7 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -440,17 +440,18 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) s3c24xx_i2s_pcm_stereo_out.addr = res->start + S3C2410_IISFIFO; s3c24xx_i2s_pcm_stereo_in.addr = res->start + S3C2410_IISFIFO; - ret = devm_snd_soc_register_component(&pdev->dev, - &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1); + ret = samsung_asoc_dma_platform_register(&pdev->dev, + pdata->dma_filter, + NULL, NULL); if (ret) { dev_err(&pdev->dev, "Failed to register the DAI\n"); return ret; } - ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, - NULL, NULL); + ret = devm_snd_soc_register_component(&pdev->dev, + &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1); if (ret) - dev_err(&pdev->dev, "Failed to register the DMA: %d\n", ret); + pr_err("failed to register the dai\n"); return ret; } |