[PATCH] usb: core: don't power off roothub PHYs if phy_set_mode() fails

[PATCH] usb: core: don't power off roothub PHYs if phy_set_mode() fails

[Gabor Juhos]

Remove the error path from the usb_phy_roothub_set_mode() function.
The code is clearly wrong, because phy_set_mode() calls can't be
balanced with phy_power_off() calls.

Additionally, the usb_phy_roothub_set_mode() function is called only
from usb_add_hcd() before it powers on the PHYs, so powering off those
makes no sense anyway.

Presumably, the code is copy-pasted from the phy_power_on() function
without adjusting the error handling.

Cc: stable@vger.kernel.org # v5.1+
Fixes: b97a31348379 ("usb: core: comply to PHY framework")
Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
---
 drivers/usb/core/phy.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/usb/core/phy.c b/drivers/usb/core/phy.c
index faa20054ad5a1c3f704cb9f70b5049cefdab804e..4bba1c2757406a35bf19eb7984a2807212374d18 100644
--- a/drivers/usb/core/phy.c
+++ b/drivers/usb/core/phy.c
@@ -200,16 +200,10 @@ int usb_phy_roothub_set_mode(struct usb_phy_roothub *phy_roothub,
 	list_for_each_entry(roothub_entry, head, list) {
 		err = phy_set_mode(roothub_entry->phy, mode);
 		if (err)
-			goto err_out;
+			return err;
 	}
 
 	return 0;
-
-err_out:
-	list_for_each_entry_continue_reverse(roothub_entry, head, list)
-		phy_power_off(roothub_entry->phy);
-
-	return err;
 }
 EXPORT_SYMBOL_GPL(usb_phy_roothub_set_mode);
 

---
base-commit: 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b
change-id: 20260218-usb-phy-poweroff-fix-c354b6ba142c

Best regards,
-- 
Gabor Juhos <j4g8y7@gmail.com>

Re: [PATCH] usb: core: don't power off roothub PHYs if phy_set_mode() fails

[Miquel Raynal]

On 18/02/2026 at 21:21:07 +01, Gabor Juhos <j4g8y7@gmail.com> wrote:

> Remove the error path from the usb_phy_roothub_set_mode() function.
> The code is clearly wrong, because phy_set_mode() calls can't be
> balanced with phy_power_off() calls.
>
> Additionally, the usb_phy_roothub_set_mode() function is called only
> from usb_add_hcd() before it powers on the PHYs, so powering off those
> makes no sense anyway.
>
> Presumably, the code is copy-pasted from the phy_power_on() function
> without adjusting the error handling.
>
> Cc: stable@vger.kernel.org # v5.1+
> Fixes: b97a31348379 ("usb: core: comply to PHY framework")
> Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>

Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>