[alsa-devel] [PATCH v3 1/4] ASoc: kirkwood: simplify probe error

Russell King - ARM Linux linux at arm.linux.org.uk
Sat Aug 3 14:39:54 CEST 2013


On Wed, Jul 31, 2013 at 08:17:39AM +0200, Jean-Francois Moine wrote:
> @@ -519,30 +532,17 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
>  
>  	err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component,
>  					 soc_dai, 1);
> -	if (!err)
> -		return 0;
> -	dev_err(&pdev->dev, "snd_soc_register_component failed\n");
> -
> -	if (!IS_ERR(priv->extclk))
> -		clk_disable_unprepare(priv->extclk);
> -	clk_disable_unprepare(priv->clk);
> +	if (err) {
> +		dev_err(&pdev->dev, "snd_soc_register_component failed\n");
> +		goto fail;
> +	}
> +	return 0;

This doesn't apply to mainline as there's a clk_put() there.


More information about the Alsa-devel mailing list