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

Commit 7803e329 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: samsung: Fix checking return value of clk_get 



clk_get() returns a pointer to the struct clk or an ERR_PTR().
This patch also use PTR_ERR() for return value.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5e538eca

sound/soc/samsung/s3c2412-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -69,10 +69,10 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai) 
	s3c2412_i2s.dma_playback = &s3c2412_i2s_pcm_stereo_out;



	s3c2412_i2s.iis_cclk = clk_get(dai->dev, "i2sclk");

	if (s3c2412_i2s.iis_cclk == NULL) {

	if (IS_ERR(s3c2412_i2s.iis_cclk)) {

		pr_err("failed to get i2sclk clock\n");

		iounmap(s3c2412_i2s.regs);

		return -ENODEV;

		return PTR_ERR(s3c2412_i2s.iis_cclk);

	}



	/* Set MPLL as the source for IIS CLK */

sound/soc/samsung/s3c24xx-i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -383,10 +383,10 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai) 
		return -ENXIO;



	s3c24xx_i2s.iis_clk = clk_get(dai->dev, "iis");

	if (s3c24xx_i2s.iis_clk == NULL) {

	if (IS_ERR(s3c24xx_i2s.iis_clk)) {

		pr_err("failed to get iis_clock\n");

		iounmap(s3c24xx_i2s.regs);

		return -ENODEV;

		return PTR_ERR(s3c24xx_i2s.iis_clk);

	}

	clk_enable(s3c24xx_i2s.iis_clk);

sound/soc/samsung/s3c24xx_uda134x.c

+4 −4
Original line number Diff line number Diff line
@@ -66,17 +66,17 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) 
	pr_debug("%s %d\n", __func__, clk_users);

	if (clk_users == 0) {

		xtal = clk_get(&s3c24xx_uda134x_snd_device->dev, "xtal");

		if (!xtal) {

		if (IS_ERR(xtal)) {

			printk(KERN_ERR "%s cannot get xtal\n", __func__);

			ret = -EBUSY;

			ret = PTR_ERR(xtal);

		} else {

			pclk = clk_get(&s3c24xx_uda134x_snd_device->dev,

				       "pclk");

			if (!pclk) {

			if (IS_ERR(pclk)) {

				printk(KERN_ERR "%s cannot get pclk\n",

				       __func__);

				clk_put(xtal);

				ret = -EBUSY;

				ret = PTR_ERR(pclk);

			}

		}

		if (!ret) {