Commit f2004e82 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

usb: typec: qcom-pmic: fix pdphy start() error handling 



Move disabling of the vdd-pdphy supply to the start() function which
enabled it for symmetry and to make sure that it is disabled as intended
in all error paths of pmic_typec_pdphy_reset() (i.e. not just when
qcom_pmic_typec_pdphy_enable() fails).

Cc: stable+noautosel@kernel.org	# Not needed in any stable release, just a minor bugfix
Fixes: a4422ff2 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver")
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-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/20240418145730.4605-3-johan+linaro@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d80eee97

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

+7 −4
Original line number Diff line number Diff line
@@ -475,10 +475,8 @@ static int qcom_pmic_typec_pdphy_enable(struct pmic_typec_pdphy *pmic_typec_pdph 


	qcom_pmic_typec_pdphy_reset_off(pmic_typec_pdphy);

done:

	if (ret) {

		regulator_disable(pmic_typec_pdphy->vdd_pdphy);

	if (ret)

		dev_err(dev, "pdphy_enable fail %d\n", ret);

	}



	return ret;

}
@@ -524,12 +522,17 @@ static int qcom_pmic_typec_pdphy_start(struct pmic_typec *tcpm, 


	ret = pmic_typec_pdphy_reset(pmic_typec_pdphy);

	if (ret)

		return ret;

		goto err_disable_vdd_pdhy;



	for (i = 0; i < pmic_typec_pdphy->nr_irqs; i++)

		enable_irq(pmic_typec_pdphy->irq_data[i].irq);



	return 0;



err_disable_vdd_pdhy:

	regulator_disable(pmic_typec_pdphy->vdd_pdphy);



	return ret;

}



static void qcom_pmic_typec_pdphy_stop(struct pmic_typec *tcpm)