| From a7914f042375bc2da5f1f702ffaf1092b3293b82 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Tue, 1 Oct 2019 15:01:17 +0300 |
| Subject: [PATCH] usb: typec: tcpm: usb: typec: tcpm: Fix a signedness bug in |
| tcpm_fw_get_caps() |
| |
| commit 7101949f36fc77b530b73e4c6bd0066a2740d75b upstream. |
| |
| The "port->typec_caps.data" and "port->typec_caps.type" variables are |
| enums and in this context GCC will treat them as an unsigned int so they |
| can never be less than zero. |
| |
| Fixes: ae8a2ca8a221 ("usb: typec: Group all TCPCI/TCPM code together") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Cc: stable <stable@vger.kernel.org> |
| Reviewed-by: Guenter Roeck <linux@roeck-us.net> |
| Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| Link: https://lore.kernel.org/r/20191001120117.GA23528@mwanda |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c |
| index bcfdb55fd198..a3cf27120164 100644 |
| --- a/drivers/usb/typec/tcpm/tcpm.c |
| +++ b/drivers/usb/typec/tcpm/tcpm.c |
| @@ -4416,18 +4416,20 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, |
| /* USB data support is optional */ |
| ret = fwnode_property_read_string(fwnode, "data-role", &cap_str); |
| if (ret == 0) { |
| - port->typec_caps.data = typec_find_port_data_role(cap_str); |
| - if (port->typec_caps.data < 0) |
| - return -EINVAL; |
| + ret = typec_find_port_data_role(cap_str); |
| + if (ret < 0) |
| + return ret; |
| + port->typec_caps.data = ret; |
| } |
| |
| ret = fwnode_property_read_string(fwnode, "power-role", &cap_str); |
| if (ret < 0) |
| return ret; |
| |
| - port->typec_caps.type = typec_find_port_power_role(cap_str); |
| - if (port->typec_caps.type < 0) |
| - return -EINVAL; |
| + ret = typec_find_port_power_role(cap_str); |
| + if (ret < 0) |
| + return ret; |
| + port->typec_caps.type = ret; |
| port->port_type = port->typec_caps.type; |
| |
| if (port->port_type == TYPEC_PORT_SNK) |
| -- |
| 2.7.4 |
| |
