Commit 7e5870a7 authored by Jonathan Marek's avatar Jonathan Marek Committed by Wen Zhiwei
Browse files

usb: typec: qcom-pmic-typec: fix sink status being overwritten with RP_DEF 

stable inclusion
from stable-v6.6.58
commit 479830f6c15b1a3e3c1488762a8a3bcf93e2b94f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB3BSC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=479830f6c15b1a3e3c1488762a8a3bcf93e2b94f



--------------------------------

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: a4422ff2 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarJonathan Marek <jonathan@marek.ca>
Acked-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20241005144146.2345-1-jonathan@marek.ca


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 98ea4056

drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c

+0 −1
Original line number Diff line number Diff line
@@ -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)