usb: dwc2: improve error handling in __dwc2_lowlevel_hw_enable

Add error handling in __dwc2_lowlevel_hw_enable() that may leave the
clocks and regulators enabled upon error.

Acked-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Link: https://lore.kernel.org/r/20230414084137.1050487-2-fabrice.gasnier@foss.st.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index d1589ba7d322dc6ccf8427ab29c131059c4ee80a..c431ce6c119f4b74ce38bf9a49a811c6e451a4d2 100644 (file)
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -104,7 +104,7 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
        if (hsotg->clk) {
                ret = clk_prepare_enable(hsotg->clk);
                if (ret)
-                       return ret;
+                       goto err_dis_reg;
        }
 
        if (hsotg->uphy) {
@@ -113,10 +113,25 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg)
                ret = hsotg->plat->phy_init(pdev, hsotg->plat->phy_type);
        } else {
                ret = phy_init(hsotg->phy);
-               if (ret == 0)
+               if (ret == 0) {
                        ret = phy_power_on(hsotg->phy);
+                       if (ret)
+                               phy_exit(hsotg->phy);
+               }
        }
 
+       if (ret)
+               goto err_dis_clk;
+
+       return 0;
+
+err_dis_clk:
+       if (hsotg->clk)
+               clk_disable_unprepare(hsotg->clk);
+
+err_dis_reg:
+       regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
+
        return ret;
 }