Merge remote-tracking branch 'asoc/fix/samsung' into asoc-next (89bc3f2c) · Commits · e / devices / android_kernel_teracube_mt6765

sound/soc/samsung/s3c24xx-i2s.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
		{
		int ret = 0;

		ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
		ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai);
		if (ret) {
		pr_err("failed to register the dai\n");
		return ret;