Skip to content

Commit

Permalink
clk: renesas: rcar-usb2-clock-sel: Fix error handling in .probe()
Browse files Browse the repository at this point in the history
The error handling paths after pm_runtime_get_sync() have no refcount
decrement, which leads to refcount leak.

Signed-off-by: Dinghao Liu <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
[geert: Remove now unused variable priv]
Signed-off-by: Geert Uytterhoeven <[email protected]>
  • Loading branch information
dinghaoliu authored and geertu committed May 11, 2021
1 parent 1692740 commit a20a40a
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions drivers/clk/renesas/rcar-usb2-clock-sel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand All @@ -183,18 +178,29 @@ 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);

init.name = "rcar_usb2_clock_sel";
init.ops = &usb2_clock_sel_clock_ops;
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 = {
Expand Down

0 comments on commit a20a40a

Please sign in to comment.