Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c9473c5 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a076d418

sound/soc/samsung/s3c24xx-i2s.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

}