]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: typec: tcpm: Check for port type for Try.SRC/Try.SNK
authorBadhri Jagan Sridharan <badhri@google.com>
Mon, 28 Aug 2017 17:23:13 +0000 (10:23 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Aug 2017 06:21:10 +0000 (08:21 +0200)
Enable Try.SRC or Try.SNK only when port_type is
DRP. Try.SRC or Try.SNK state machines are not
valid for SRC only or SNK only ports.

Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/typec/tcpm.c

index 7c9b1485818b16c814243c2765731a49e12fa823..81b052384cd5cda9f3cab49261ec828e2db32f4e 100644 (file)
@@ -328,10 +328,12 @@ struct pd_rx_event {
         (tcpm_cc_is_audio((port)->cc2) && tcpm_cc_is_open((port)->cc1)))
 
 #define tcpm_try_snk(port) \
-       ((port)->try_snk_count == 0 && (port)->try_role == TYPEC_SINK)
+       ((port)->try_snk_count == 0 && (port)->try_role == TYPEC_SINK && \
+       (port)->port_type == TYPEC_PORT_DRP)
 
 #define tcpm_try_src(port) \
-       ((port)->try_src_count == 0 && (port)->try_role == TYPEC_SOURCE)
+       ((port)->try_src_count == 0 && (port)->try_role == TYPEC_SOURCE && \
+       (port)->port_type == TYPEC_PORT_DRP)
 
 static enum tcpm_state tcpm_default_state(struct tcpm_port *port)
 {