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

Commit 8698475a authored by Arvind Yadav's avatar Arvind Yadav Committed by Mark Brown
Browse files

ASoC: samsung: s3c24xx: Handle return value of clk_prepare_enable. 



clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: default avatarArvind Yadav <arvind.yadav.cs@gmail.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d2d2c0a0

sound/soc/samsung/s3c24xx-i2s.c

+9 −2
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate); 


static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)

{

	int ret;

	snd_soc_dai_init_dma_data(dai, &s3c24xx_i2s_pcm_stereo_out,

					&s3c24xx_i2s_pcm_stereo_in);
@@ -348,7 +349,9 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai) 
		pr_err("failed to get iis_clock\n");

		return PTR_ERR(s3c24xx_i2s.iis_clk);

	}

	clk_prepare_enable(s3c24xx_i2s.iis_clk);

	ret = clk_prepare_enable(s3c24xx_i2s.iis_clk);

	if (ret)

		return ret;



	/* Configure the I2S pins (GPE0...GPE4) in correct mode */

	s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2),
@@ -377,7 +380,11 @@ static int s3c24xx_i2s_suspend(struct snd_soc_dai *cpu_dai) 


static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai)

{

	clk_prepare_enable(s3c24xx_i2s.iis_clk);

	int ret;



	ret = clk_prepare_enable(s3c24xx_i2s.iis_clk);

	if (ret)

		return ret;



	writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON);

	writel(s3c24xx_i2s.iismod, s3c24xx_i2s.regs + S3C2410_IISMOD);