]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
usb: core: don't power off roothub PHYs if phy_set_mode() fails
authorGabor Juhos <j4g8y7@gmail.com>
Wed, 18 Feb 2026 20:21:07 +0000 (21:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 11 Mar 2026 15:16:41 +0000 (16:16 +0100)
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>
Link: https://patch.msgid.link/20260218-usb-phy-poweroff-fix-v1-1-66e6831e860e@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/phy.c

index faa20054ad5a1c3f704cb9f70b5049cefdab804e..4bba1c2757406a35bf19eb7984a2807212374d18 100644 (file)
@@ -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);