summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Marek <jonathan@marek.ca>2024-10-05 10:41:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-10-22 15:46:32 +0200
commit479830f6c15b1a3e3c1488762a8a3bcf93e2b94f (patch)
treedd3362cc50e963d47d7496266c536b734a0ee79d
parent86c68aa714d0e5082ccee8f0679cb69821cf8339 (diff)
downloadlinux-479830f6c15b1a3e3c1488762a8a3bcf93e2b94f.tar.gz
linux-479830f6c15b1a3e3c1488762a8a3bcf93e2b94f.tar.bz2
linux-479830f6c15b1a3e3c1488762a8a3bcf93e2b94f.zip
usb: typec: qcom-pmic-typec: fix sink status being overwritten with RP_DEF
commit ffe85c24d7ca5de7d57690c0ab194b3838674935 upstream. This line is overwriting the result of the above switch-case. This fixes the tcpm driver getting stuck in a "Sink TX No Go" loop. Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver") Cc: stable <stable@kernel.org> Signed-off-by: Jonathan Marek <jonathan@marek.ca> Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20241005144146.2345-1-jonathan@marek.ca Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
index a8f3f4d3a450..d6607491fcef 100644
--- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
+++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c
@@ -252,7 +252,6 @@ int qcom_pmic_typec_port_get_cc(struct pmic_typec_port *pmic_typec_port,
val = TYPEC_CC_RP_DEF;
break;
}
- val = TYPEC_CC_RP_DEF;
}
if (misc & CC_ORIENTATION)