[PATCH] phy: fsl-imx8mq-usb: fix vbus regulator leak on error paths
From: Felix Gu
Date: Tue Jun 02 2026 - 09:17:18 EST
In imx8mq_phy_power_on(), if clk_prepare_enable() fails after
regulator_enable() has succeeded, the vbus regulator is left
enabled. The same issue exists for the alt_clk error path.
Fix both by converting to the standard goto-based cleanup
pattern, ensuring the regulator is disabled when any
subsequent step fails.
Fixes: 3b64ea4768e7 ("phy: fsl-imx8mq-usb: support alternate reference clock")
Signed-off-by: Felix Gu <ustc.gu@xxxxxxxxx>
---
drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
index b05d80e849a1..e45e4f16057e 100644
--- a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
+++ b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
@@ -627,13 +627,11 @@ static int imx8mq_phy_power_on(struct phy *phy)
ret = clk_prepare_enable(imx_phy->clk);
if (ret)
- return ret;
+ goto disable_vbus;
ret = clk_prepare_enable(imx_phy->alt_clk);
- if (ret) {
- clk_disable_unprepare(imx_phy->clk);
- return ret;
- }
+ if (ret)
+ goto disable_clk;
/* Disable rx term override */
value = readl(imx_phy->base + PHY_CTRL6);
@@ -641,6 +639,13 @@ static int imx8mq_phy_power_on(struct phy *phy)
writel(value, imx_phy->base + PHY_CTRL6);
return 0;
+
+disable_clk:
+ clk_disable_unprepare(imx_phy->clk);
+disable_vbus:
+ regulator_disable(imx_phy->vbus);
+
+ return ret;
}
static int imx8mq_phy_power_off(struct phy *phy)
---
base-commit: 08484c504b55a98bd100527fbe10a3caf55ff3ff
change-id: 20260602-imx9mq-30169239b590
Best regards,
--
Felix Gu <ustc.gu@xxxxxxxxx>