[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <c5965733-f49b-4245-8d4e-778c94203845@linaro.org>
Date: Fri, 19 Apr 2024 00:41:54 +0100
From: Bryan O'Donoghue <bryan.odonoghue@...aro.org>
To: Johan Hovold <johan+linaro@...nel.org>,
Heikki Krogerus <heikki.krogerus@...ux.intel.com>
Cc: Bjorn Andersson <andersson@...nel.org>,
Konrad Dybcio <konrad.dybcio@...aro.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
linux-arm-msm@...r.kernel.org, linux-usb@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/2] usb: typec: qcom-pmic: fix pdphy start() error
handling
On 18/04/2024 15:57, Johan Hovold wrote:
> 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).
>
> Fixes: a4422ff22142 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver")
> Signed-off-by: Johan Hovold <johan+linaro@...nel.org>
> ---
> drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
> index 6560f4fc98d5..5b7f52b74a40 100644
> --- a/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
> +++ b/drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c
> @@ -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)
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@...aro.org>
Powered by blists - more mailing lists