Re: [PATCH 2/2] drm/fsl-dcu: check for clk_prepare_enable() error

[Gabriel Krisman Bertazi <krisman@collabora.co.uk>]

Fabio Estevam <festevam@gmail.com> writes:

> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> clk_prepare_enable() may fail, so we should better check its return 
> value.
>
> Also place the of_node_put() function right after clk_prepare_enable(),
> in order to avoid calling of_node_put() twice in case clk_prepare_enable()
> fails.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
>  drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_tcon.c b/drivers/gpu/drm/fsl-dcu/fsl_tcon.c
> index 2fbb7ee..b3d70a6 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_tcon.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_tcon.c
> @@ -87,9 +87,13 @@ struct fsl_tcon *fsl_tcon_init(struct device *dev)
>  		goto err_node_put;
>  	}
>  
> -	of_node_put(np);
> -	clk_prepare_enable(tcon->ipg_clk);
> +	ret = clk_prepare_enable(tcon->ipg_clk);
> +	if (ret) {
> +		dev_err(dev, "Couldn't enable the TCON clock\n");
> +		goto err_node_put;
> +	}

This leaks tcon if clk_prepare_enable fails.

>  
> +	of_node_put(np);
>  	dev_info(dev, "Using TCON in bypass mode\n");
>  
>  	return tcon;
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel