platform/chrome: cros_ec_typec: Avoid setting usb role twice during disconnect
On disconnect port partner is removed and usb role is set to NONE. But then in cros_typec_port_update() the role is set again. Avoid this by moving usb_role_switch_set_role() to cros_typec_configure_mux(). Suggested-by: Prashant Malani <pmalani@chromium.org> Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
This commit is contained in:
parent
5381b0ed54
commit
b12e4fd5f3
|
@ -564,7 +564,12 @@ static int cros_typec_configure_mux(struct cros_typec_data *typec, int port_num,
|
||||||
ret = -ENOTSUPP;
|
ret = -ENOTSUPP;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
return usb_role_switch_set_role(typec->ports[port_num]->role_sw,
|
||||||
|
pd_ctrl->role & PD_CTRL_RESP_ROLE_DATA
|
||||||
|
? USB_ROLE_HOST : USB_ROLE_DEVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
|
static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
|
||||||
|
@ -621,9 +626,7 @@ static int cros_typec_port_update(struct cros_typec_data *typec, int port_num)
|
||||||
if (ret)
|
if (ret)
|
||||||
dev_warn(typec->dev, "Configure muxes failed, err = %d\n", ret);
|
dev_warn(typec->dev, "Configure muxes failed, err = %d\n", ret);
|
||||||
|
|
||||||
return usb_role_switch_set_role(typec->ports[port_num]->role_sw,
|
return ret;
|
||||||
resp.role & PD_CTRL_RESP_ROLE_DATA
|
|
||||||
? USB_ROLE_HOST : USB_ROLE_DEVICE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cros_typec_get_cmd_version(struct cros_typec_data *typec)
|
static int cros_typec_get_cmd_version(struct cros_typec_data *typec)
|
||||||
|
|
Loading…
Reference in New Issue