From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: Johan Hovold <johan+linaro@kernel.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] usb: typec: qcom-pmic: fix pdphy start() error handling
Date: Fri, 19 Apr 2024 00:41:54 +0100 [thread overview]
Message-ID: <c5965733-f49b-4245-8d4e-778c94203845@linaro.org> (raw)
In-Reply-To: <20240418145730.4605-3-johan+linaro@kernel.org>
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@kernel.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@linaro.org>
next prev parent reply other threads:[~2024-04-18 23:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 14:57 [PATCH 0/2] usb: typec: qcom-pmic: fix use-after-free on late probe errors Johan Hovold
2024-04-18 14:57 ` [PATCH 1/2] " Johan Hovold
2024-04-18 17:45 ` Dmitry Baryshkov
2024-04-18 23:41 ` Bryan O'Donoghue
2024-04-22 11:13 ` Heikki Krogerus
2024-04-18 14:57 ` [PATCH 2/2] usb: typec: qcom-pmic: fix pdphy start() error handling Johan Hovold
2024-04-18 18:00 ` Dmitry Baryshkov
2024-04-18 23:41 ` Bryan O'Donoghue [this message]
2024-04-22 11:20 ` Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c5965733-f49b-4245-8d4e-778c94203845@linaro.org \
--to=bryan.odonoghue@linaro.org \
--cc=andersson@kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=johan+linaro@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).