[PATCH 5.12 111/173] usb: typec: tcpm: cancel frs hrtimer when unregister tcpm port

From: Greg Kroah-Hartman
Date: Mon Jun 14 2021 - 07:31:44 EST


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);