Commit 2e2b8d15 authored by Kyle Tso's avatar Kyle Tso Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP 



After receiving Sink Capabilities Message in GET_SINK_CAP AMS, it is
incorrect to call tcpm_pd_handle_state because the Message is expected
and the current state is not Ready states. The result of this incorrect
operation ends in Soft Reset which is definitely wrong. Simply
forwarding to Ready States is enough to finish the AMS.

Fixes: 8dea75e1 ("usb: typec: tcpm: Protocol Error handling")
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarKyle Tso <kyletso@google.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210503171849.2605302-1-kyletso@google.com


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

drivers/usb/typec/tcpm/tcpm.c

+1 −1
Original line number Diff line number Diff line
@@ -2390,7 +2390,7 @@ static void tcpm_pd_data_request(struct tcpm_port *port, 
		port->nr_sink_caps = cnt;

		port->sink_cap_done = true;

		if (port->ams == GET_SINK_CAPABILITIES)

			tcpm_pd_handle_state(port, ready_state(port), NONE_AMS, 0);

			tcpm_set_state(port, ready_state(port), 0);

		/* Unexpected Sink Capabilities */

		else

			tcpm_pd_handle_msg(port,