lkml.org 
[lkml]   [2017]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH review for 4.9 21/50] drm/fsl-dcu: check for clk_prepare_enable() error
    Date
    From: Fabio Estevam <fabio.estevam@nxp.com>

    [ Upstream commit ef15d36154cc741d7ded4ae4fa0cf7987354e313 ]

    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>
    Signed-off-by: Stefan Agner <stefan@agner.ch>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.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 3194e544ee27..faacc813254c 100644
    --- a/drivers/gpu/drm/fsl-dcu/fsl_tcon.c
    +++ b/drivers/gpu/drm/fsl-dcu/fsl_tcon.c
    @@ -89,9 +89,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;
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-10-08 00:48    [W:7.418 / U:24.936 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site