This is a note to let you know that I've just added the patch titled platform/chrome: cros_ec_typec: Cleanup switch handle return paths to the 6.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: platform-chrome-cros_ec_typec-cleanup-switch-handle-.patch and it can be found in the queue-6.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit 24f72e5ebe08ec7e306882a00f3e32b21fe2eb72 Author: Prashant Malani <pmalani@xxxxxxxxxxxx> Date: Tue Aug 16 21:48:34 2022 +0000 platform/chrome: cros_ec_typec: Cleanup switch handle return paths [ Upstream commit d5f66527db9e0e6a871d9005200b3394156cf16f ] Some of the return paths for the cros_typec_get_switch_handles() aren't necessary. Clean up the return paths to only undo the handle get's which succeeded. Signed-off-by: Prashant Malani <pmalani@xxxxxxxxxxxx> Reviewed-by: Tzung-Bi Shih <tzungbi@xxxxxxxxxx> Link: https://lore.kernel.org/r/20220816214857.2088914-7-pmalani@xxxxxxxxxxxx Stable-dep-of: 9a8aadcf0b45 ("platform/chrome: cros_ec_typec: zero out stale pointers") Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c index dc5722db2066..fcfb98992920 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -159,12 +159,10 @@ static int cros_typec_get_switch_handles(struct cros_typec_port *port, return 0; role_sw_err: - usb_role_switch_put(port->role_sw); -ori_sw_err: typec_switch_put(port->ori_sw); -mux_err: +ori_sw_err: typec_mux_put(port->mux); - +mux_err: return -ENODEV; }