Alexey Galakhov wrote:
>
> There was a compilation error introduced on Dec 7, 2012
> by commit a08485d8fdf6f67ca5f173b68d8f873c574745f2.
>
Following is better:
The commit a08485d8 ("ASoC: Samsung: Do not register samsung audio dma
device as pdev") introduced compilation error.
> Combination of CONFIG_CPU_S3C2440 and CONFIG_SND_S3C24XX_I2S
> caused the following:
> sound/soc/samsung/s3c24xx-i2s.c: In function 's3c24xx_iis_dev_probe':
> sound/soc/samsung/s3c24xx-i2s.c:472:2: error: implicit declaration of
> function 's3c_i2sv2_register_dai' [-Werror=implicit-function-declaration]
> sound/soc/samsung/s3c24xx-i2s.c:472:48: error: 's3c2412_i2s_dai'
> undeclared (first use in this function)
>
> This patch fixes the problem and makes S3C2440 I2S usable again.
>
> Signed-off-by: Alexey Galakhov <agalakhov@xxxxxxxxx>
Cc: Padmavathi Venna <padma.v@xxxxxxxxxxx>
Cc: Sangbeom Kim <sbkim73@xxxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
> sound/soc/samsung/s3c24xx-i2s.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/samsung/s3c24xx-i2s.c
> b/sound/soc/samsung/s3c24xx-i2s.c
> index ee10e87..13f6dd1 100644
> --- a/sound/soc/samsung/s3c24xx-i2s.c
> +++ b/sound/soc/samsung/s3c24xx-i2s.c
> @@ -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;
> --
> 1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
