Skip to content

Commit

Permalink
reset: renesas: Fix Runtime PM usage
Browse files Browse the repository at this point in the history
If pm_runtime_resume_and_get() fails then it returns w/o the RPM usage
counter being incremented. In this case call pm_runtime_put() in
remove() will result in a usage counter imbalance. Therefore check the
return code of pm_runtime_resume_and_get() and bail out in case of error.

Fixes: bee0855 ("reset: renesas: Add RZ/G2L usbphy control driver")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/ec24e13f-0530-b091-7a08-864577b9b3be@gmail.com
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  • Loading branch information
Heiner Kallweit authored and Philipp Zabel committed Dec 15, 2021
1 parent 69125b4 commit 92c959b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/reset/reset-rzg2l-usbphy-ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,12 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev)
dev_set_drvdata(dev, priv);

pm_runtime_enable(&pdev->dev);
pm_runtime_resume_and_get(&pdev->dev);
error = pm_runtime_resume_and_get(&pdev->dev);
if (error < 0) {
pm_runtime_disable(&pdev->dev);
reset_control_assert(priv->rstc);
return dev_err_probe(&pdev->dev, error, "pm_runtime_resume_and_get failed");
}

/* put pll and phy into reset state */
spin_lock_irqsave(&priv->lock, flags);
Expand Down

0 comments on commit 92c959b

Please sign in to comment.