This is a note to let you know that I've just added the patch titled usb: typec: tcpm: cancel frs hrtimer when unregister tcpm port to the 5.12-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: usb-typec-tcpm-cancel-frs-hrtimer-when-unregister-tcpm-port.patch and it can be found in the queue-5.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 7ade4805e296c8d1e40c842395bbe478c7210555 Mon Sep 17 00:00:00 2001 From: Li Jun <jun.li@xxxxxxx> Date: Wed, 2 Jun 2021 17:57:08 +0800 Subject: usb: typec: tcpm: cancel frs hrtimer when unregister tcpm port From: Li Jun <jun.li@xxxxxxx> commit 7ade4805e296c8d1e40c842395bbe478c7210555 upstream. Like the state_machine_timer, we should also cancel possible pending frs hrtimer when unregister tcpm port. Fixes: 8dc4bd073663 ("usb: typec: tcpm: Add support for Sink Fast Role SWAP(FRS)") Cc: stable <stable@xxxxxxxxxxxxxxx> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> Signed-off-by: Li Jun <jun.li@xxxxxxx> Link: https://lore.kernel.org/r/1622627829-11070-2-git-send-email-jun.li@xxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/typec/tcpm/tcpm.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -6228,6 +6228,7 @@ void tcpm_unregister_port(struct tcpm_po { int i; + hrtimer_cancel(&port->enable_frs_timer); hrtimer_cancel(&port->vdm_state_machine_timer); hrtimer_cancel(&port->state_machine_timer); Patches currently in stable-queue which might be from jun.li@xxxxxxx are queue-5.12/usb-chipidea-udc-assign-interrupt-number-to-usb-gadg.patch queue-5.12/usb-typec-tcpm-cancel-frs-hrtimer-when-unregister-tcpm-port.patch queue-5.12/usb-typec-tcpm-cancel-vdm-and-state-machine-hrtimer-when-unregister-tcpm-port.patch