[PATCH v3 2/3] platform/chrome: cros_ec_typec: Avoid setting usb role twice during disconnect

[Azhar Shaikh]

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().

Signed-off-by: Azhar Shaikh <azhar.sha...@intel.com>
---
Changes in v3:
 - Move the location of calling usb_role_switch_set_role() to
   end of function in cros_typec_configure_mux() to avoid any change
   in code flow.

Changes in v2:
 - New patch added

 drivers/platform/chrome/cros_ec_typec.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_typec.c 
b/drivers/platform/chrome/cros_ec_typec.c
index 06108212ee94..2b43e1176e73 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -533,7 +533,12 @@ static int cros_typec_configure_mux(struct cros_typec_data 
*typec, int port_num,
                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)
@@ -590,9 +595,7 @@ static int cros_typec_port_update(struct cros_typec_data 
*typec, int port_num)
        if (ret)
                dev_warn(typec->dev, "Configure muxes failed, err = %d\n", ret);
 
-       return usb_role_switch_set_role(typec->ports[port_num]->role_sw,
-                                      resp.role & PD_CTRL_RESP_ROLE_DATA
-                                      ? USB_ROLE_HOST : USB_ROLE_DEVICE);
+       return ret;
 }
 
 static int cros_typec_get_cmd_version(struct cros_typec_data *typec)
-- 
2.17.1