From: Fabio Estevam Date: Wed, 28 Dec 2016 16:48:48 +0000 (-0200) Subject: drm/fsl-dcu: check for clk_prepare_enable() error X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ef15d36154cc741d7ded4ae4fa0cf7987354e313;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git drm/fsl-dcu: check for clk_prepare_enable() error 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 Signed-off-by: Stefan Agner --- diff --git a/drivers/gpu/drm/fsl-dcu/fsl_tcon.c b/drivers/gpu/drm/fsl-dcu/fsl_tcon.c index 2fbb7eedb066..b3d70a63c5a3 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; + } + of_node_put(np); dev_info(dev, "Using TCON in bypass mode\n"); return tcon;