]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
usb: typec: tcpm: cancel send discover hrtimer when unregister tcpm port
authorLi Jun <jun.li@nxp.com>
Wed, 2 Jun 2021 09:57:09 +0000 (17:57 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Jun 2021 11:28:01 +0000 (13:28 +0200)
Like the state_machine_timer, we should also cancel possible pending
send discover identity hrtimer when unregister tcpm port.

Fixes: c34e85fa69b9 ("usb: typec: tcpm: Send DISCOVER_IDENTITY from dedicated work")
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Li Jun <jun.li@nxp.com>
Link: https://lore.kernel.org/r/1622627829-11070-3-git-send-email-jun.li@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/tcpm/tcpm.c

index a1382e878127f885094e5d8bc20064c8b20857ae..a7c336f56849c4acf3f850ceb480bfc3f695a4c7 100644 (file)
@@ -6335,6 +6335,7 @@ void tcpm_unregister_port(struct tcpm_port *port)
 {
        int i;
 
+       hrtimer_cancel(&port->send_discover_timer);
        hrtimer_cancel(&port->enable_frs_timer);
        hrtimer_cancel(&port->vdm_state_machine_timer);
        hrtimer_cancel(&port->state_machine_timer);