Commit 3bac42f0 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpm: Clear send_discover in tcpm_check_send_discover 



tcpm_check_send_discover does not clear the send_discover flag
when any of the following conditions are not met.
1. data_role is TYPEC_HOST
2. link is pd_capable

Discovery indentity would anyways not be attempted during
the current session anymore when the above conditions are not
met. Hence clear the send_discover flag here to prevent
tcpm_enable_frs_work from rescheduling indefinetly.

Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarBadhri Jagan Sridharan <badhri@google.com>
Link: https://lore.kernel.org/r/20201203031908.1491542-1-badhri@google.com


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

drivers/usb/typec/tcpm/tcpm.c

+2 −3
Original line number Diff line number Diff line
@@ -3035,11 +3035,10 @@ static inline enum tcpm_state unattached_state(struct tcpm_port *port) 
static void tcpm_check_send_discover(struct tcpm_port *port)

{

	if (port->data_role == TYPEC_HOST && port->send_discover &&

	    port->pd_capable) {

	    port->pd_capable)

		tcpm_send_vdm(port, USB_SID_PD, CMD_DISCOVER_IDENT, NULL, 0);

	port->send_discover = false;

}

}



static void tcpm_swap_complete(struct tcpm_port *port, int result)

{