From: Pengpeng Hou <pengpeng@iscas.ac.cn>
To: Vinod Koul <vkoul@kernel.org>
Cc: Pengpeng Hou <pengpeng@iscas.ac.cn>,
Neil Armstrong <neil.armstrong@linaro.org>,
Manivannan Sadhasivam <mani@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] phy: qcom: m31: propagate reset errors
Date: Sun, 30 Aug 2026 21:14:42 +0800 [thread overview]
Message-ID: <20260830131442.3025-1-pengpeng@iscas.ac.cn> (raw)
m31usb_phy_init() enables the regulator and clock, then performs an
unchecked
reset pulse before reporting that the PHY powered on.
Return reset-controller errors and release the clock and regulator that
were
enabled for the failed power-on attempt.
Fixes: 08e49af50701 ("phy: qcom: Introduce M31 USB PHY driver")
Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
---
drivers/phy/qualcomm/phy-qcom-m31.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-m31.c b/drivers/phy/qualcomm/phy-qcom-m31.c
index 168ea980fda03..f46c7ec87496a 100644
--- a/drivers/phy/qualcomm/phy-qcom-m31.c
+++ b/drivers/phy/qualcomm/phy-qcom-m31.c
@@ -228,9 +228,14 @@ static int m31usb_phy_init(struct phy *phy)
}
/* Perform phy reset */
- reset_control_assert(qphy->reset);
+ ret = reset_control_assert(qphy->reset);
+ if (ret)
+ goto disable_clk;
+
udelay(5);
- reset_control_deassert(qphy->reset);
+ ret = reset_control_deassert(qphy->reset);
+ if (ret)
+ goto disable_clk;
/* configure for ULPI mode if requested */
if (qphy->ulpi_mode)
@@ -247,6 +252,12 @@ static int m31usb_phy_init(struct phy *phy)
}
return 0;
+
+disable_clk:
+ clk_disable_unprepare(qphy->clk);
+ regulator_disable(qphy->vreg);
+
+ return ret;
}
static int m31usb_phy_shutdown(struct phy *phy)
base-commit: 08dbfad3f5040f5bdb6c529da20d6d4e81fefd72
--
2.50.1
next reply other threads:[~2026-08-30 13:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-30 13:14 Pengpeng Hou [this message]
2026-09-01 9:45 ` Konrad Dybcio
2026-09-01 12:22 ` Abel Vesa
2026-09-01 15:43 ` Krishna Kurapati
2026-10-12 8:52 ` Manivannan Sadhasivam
2026-11-12 9:04 ` (subset) " Vinod Koul
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=20260830131442.3025-1-pengpeng@iscas.ac.cn \
--to=pengpeng@iscas.ac.cn \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=mani@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=p.zabel@pengutronix.de \
--cc=vkoul@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
all inboxes | Powered by JetHome®