Commit e293015b authored by Gabor Juhos's avatar Gabor Juhos Committed by Greg Kroah-Hartman
Browse files

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



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: b97a3134 ("usb: core: comply to PHY framework")
Signed-off-by: default avatarGabor Juhos <j4g8y7@gmail.com>
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://patch.msgid.link/20260218-usb-phy-poweroff-fix-v1-1-66e6831e860e@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1be3b77d

drivers/usb/core/phy.c

+1 −7
Original line number Diff line number Diff line
@@ -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);