usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP

commit 2e2b8d15adc2f6ab2d4aa0550e241b9742a436a0 upstream.

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: 8dea75e11380 ("usb: typec: tcpm: Protocol Error handling")
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Kyle 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 7386f3e2cb697a4a51704d3c72363770a08434bd..30c5488edc0d5d0c1ae94bab48f4fa14cb315621 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -2387,7 +2387,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,