diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2016-11-02 12:04:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-02 09:15:37 -0600 |
| commit | 6c9473c55e7bb93dd4086f74e8e727dd3350855d (patch) | |
| tree | bf71e49cfc355707685049f53d9222c1b316ecfb /sound | |
| parent | a076d418235fc94030733b43114a4f1a0a3b4489 (diff) | |
| download | linux-stable-6c9473c55e7bb93dd4086f74e8e727dd3350855d.tar.gz linux-stable-6c9473c55e7bb93dd4086f74e8e727dd3350855d.tar.bz2 linux-stable-6c9473c55e7bb93dd4086f74e8e727dd3350855d.zip | |
ASoC: samsung: s3c24xx-i2s.c merge fixup
This fixes a build error as below which appeared after merging
branch fix/samsung and also proper error messages are restored.
sound/soc/samsung/s3c24xx-i2s.c: In function ‘s3c24xx_iis_dev_probe’:
sound/soc/samsung/s3c24xx-i2s.c:444:8: error: ‘pdata’ undeclared (first use in this function)
sound/soc/samsung/s3c24xx-i2s.c:444:8: note: each undeclared identifier is reported only once for each function it appears in
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index c93169823c7c..07f5091b33e8 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -436,18 +436,17 @@ 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 = samsung_asoc_dma_platform_register(&pdev->dev, - pdata->dma_filter, + ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, NULL, NULL); if (ret) { - dev_err(&pdev->dev, "Failed to register the DAI\n"); + dev_err(&pdev->dev, "Failed to register the DMA: %d\n", ret); return ret; } ret = devm_snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1); if (ret) - pr_err("failed to register the dai\n"); + dev_err(&pdev->dev, "Failed to register the DAI\n"); return ret; } |