From: Bryan O'Donoghue <bryan.odonog...@linaro.org> commit 91edf63d5022bd0464788ffb4acc3d5febbaf81d upstream.
Currently we check to make sure there is no error state on the extcon handle for VBUS when writing to the HS_PHY_GENCONFIG_2 register. When using the USB role-switch API we still need to write to this register absent an extcon handle. This patch makes the appropriate update to ensure the write happens if role-switching is true. Fixes: 05559f10ed79 ("usb: chipidea: add role switch class support") Cc: stable <sta...@vger.kernel.org> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: Philipp Zabel <p.za...@pengutronix.de> Cc: linux-...@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Stephen Boyd <swb...@chromium.org> Signed-off-by: Bryan O'Donoghue <bryan.odonog...@linaro.org> Signed-off-by: Peter Chen <peter.c...@nxp.com> Link: https://lore.kernel.org/r/20200507004918.25975-2-peter.c...@kernel.org Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- drivers/usb/chipidea/ci_hdrc_msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -114,7 +114,7 @@ static int ci_hdrc_msm_notify_event(stru hw_write_id_reg(ci, HS_PHY_GENCONFIG_2, HS_PHY_ULPI_TX_PKT_EN_CLR_FIX, 0); - if (!IS_ERR(ci->platdata->vbus_extcon.edev)) { + if (!IS_ERR(ci->platdata->vbus_extcon.edev) || ci->role_switch) { hw_write_id_reg(ci, HS_PHY_GENCONFIG_2, HS_PHY_SESS_VLD_CTRL_EN, HS_PHY_SESS_VLD_CTRL_EN);