lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.12 014/160] clk: renesas: rcar-usb2-clock-sel: Fix error handling in .probe()
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit a20a40a8bbc2cf4b29d7248ea31e974e9103dd7f ]

    The error handling paths after pm_runtime_get_sync() have no refcount
    decrement, which leads to refcount leak.

    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Link: https://lore.kernel.org/r/20210415073338.22287-1-dinghao.liu@zju.edu.cn
    [geert: Remove now unused variable priv]
    Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/renesas/rcar-usb2-clock-sel.c | 24 ++++++++++++++---------
    1 file changed, 15 insertions(+), 9 deletions(-)

    diff --git a/drivers/clk/renesas/rcar-usb2-clock-sel.c b/drivers/clk/renesas/rcar-usb2-clock-sel.c
    index 3abafd78f7c8..8b4e43659023 100644
    --- a/drivers/clk/renesas/rcar-usb2-clock-sel.c
    +++ b/drivers/clk/renesas/rcar-usb2-clock-sel.c
    @@ -128,10 +128,8 @@ static int rcar_usb2_clock_sel_resume(struct device *dev)
    static int rcar_usb2_clock_sel_remove(struct platform_device *pdev)
    {
    struct device *dev = &pdev->dev;
    - struct usb2_clock_sel_priv *priv = platform_get_drvdata(pdev);

    of_clk_del_provider(dev->of_node);
    - clk_hw_unregister(&priv->hw);
    pm_runtime_put(dev);
    pm_runtime_disable(dev);

    @@ -164,9 +162,6 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
    if (IS_ERR(priv->rsts))
    return PTR_ERR(priv->rsts);

    - pm_runtime_enable(dev);
    - pm_runtime_get_sync(dev);
    -
    clk = devm_clk_get(dev, "usb_extal");
    if (!IS_ERR(clk) && !clk_prepare_enable(clk)) {
    priv->extal = !!clk_get_rate(clk);
    @@ -183,6 +178,8 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
    return -ENOENT;
    }

    + pm_runtime_enable(dev);
    + pm_runtime_get_sync(dev);
    platform_set_drvdata(pdev, priv);
    dev_set_drvdata(dev, priv);

    @@ -193,11 +190,20 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
    init.num_parents = 0;
    priv->hw.init = &init;

    - clk = clk_register(NULL, &priv->hw);
    - if (IS_ERR(clk))
    - return PTR_ERR(clk);
    + ret = devm_clk_hw_register(NULL, &priv->hw);
    + if (ret)
    + goto pm_put;
    +
    + ret = of_clk_add_hw_provider(np, of_clk_hw_simple_get, &priv->hw);
    + if (ret)
    + goto pm_put;
    +
    + return 0;

    - return of_clk_add_hw_provider(np, of_clk_hw_simple_get, &priv->hw);
    +pm_put:
    + pm_runtime_put(dev);
    + pm_runtime_disable(dev);
    + return ret;
    }

    static const struct dev_pm_ops rcar_usb2_clock_sel_pm_ops = {
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 13:40    [W:2.552 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site