reset: renesas: Fix Runtime PM usage

commit 92c959bae2e54ba1e2540ba5f813f7752bd76be1 upstream.

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: bee08559701f ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/reset/reset-rzg2l-usbphy-ctrl.c b/drivers/reset/reset-rzg2l-usbphy-ctrl.c
index e0704fd2b5336908a1042854851e7c3238527a1a..1e831503885066b132faafd811d43837e3b72154 100644 (file)
--- a/drivers/reset/reset-rzg2l-usbphy-ctrl.c
+++ b/drivers/reset/reset-rzg2l-usbphy-ctrl.c
@@ -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);