Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1696997

Re: [PATCH v2 01/11] ASoC: samsung: s3c2412: Handle return value of clk_prepare_enable.

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

On Wed, Jul 26, 2017 at 11:15:25AM +0530, Arvind Yadav wrote:

> --- a/sound/soc/samsung/s3c2412-i2s.c
> +++ b/sound/soc/samsung/s3c2412-i2s.c
> @@ -65,13 +65,16 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
>  	s3c2412_i2s.iis_cclk = devm_clk_get(dai->dev, "i2sclk");
>  	if (IS_ERR(s3c2412_i2s.iis_cclk)) {
>  		pr_err("failed to get i2sclk clock\n");
> -		return PTR_ERR(s3c2412_i2s.iis_cclk);
> +		ret = PTR_ERR(s3c2412_i2s.iis_cclk);
> +		goto err;
>  	}
>  

Why are we making this unrelated change?  None of the error handling we
jump to is relevant if this fails...

>  	/* Set MPLL as the source for IIS CLK */
>  
>  	clk_set_parent(s3c2412_i2s.iis_cclk, clk_get(NULL, "mpll"));
> -	clk_prepare_enable(s3c2412_i2s.iis_cclk);
> +	ret = clk_prepare_enable(s3c2412_i2s.iis_cclk);
> +	if (ret)
> +		goto err;
>  
>  	s3c2412_i2s.iis_cclk = s3c2412_i2s.iis_pclk;
>  
> @@ -80,6 +83,11 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
>  			      S3C_GPIO_PULL_NONE);
>  
>  	return 0;
> +
> +err:
> +	clk_disable(s3c2412_i2s.iis_pclk);

This will disable the clock if we failed to enable it which is clearly
not correct.  It's also matching a clk_prepare_enable() with a
clk_disable() which is going to leave an unbalanced prepare.

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 01/11] ASoC: samsung: s3c2412: Handle return value of clk_prepare_enable. Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-07-26 07:50 +0200
  Re: [PATCH v2 01/11] ASoC: samsung: s3c2412: Handle return value of  clk_prepare_enable. Mark Brown <broonie@kernel.org> - 2017-07-26 13:30 +0200
    Re: [PATCH v2 01/11] ASoC: samsung: s3c2412: Handle return value of  clk_prepare_enable. Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-07-26 14:10 +0200
      Re: [PATCH v2 01/11] ASoC: samsung: s3c2412: Handle return value of  clk_prepare_enable. Mark Brown <broonie@kernel.org> - 2017-07-26 16:50 +0200
  Re: [PATCH v2 01/11] ASoC: samsung: s3c2412: Handle return value of  clk_prepare_enable. Krzysztof Kozlowski <krzk@kernel.org> - 2017-07-26 17:50 +0200

csiph-web