summaryrefslogtreecommitdiff
path: root/drivers/phy/qualcomm
diff options
context:
space:
mode:
authorJohan Hovold <johan+linaro@kernel.org>2022-05-02 15:31:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-14 18:11:52 +0200
commitf2a16af2ee0a10f4605d16cad77b95cba31a4997 (patch)
tree5a5e06e0533a4df12fb6f8c2eb5fb140bcb15237 /drivers/phy/qualcomm
parentb6b0f8904bd699882ea3801473614ec0fa8d297f (diff)
downloadlinux-f2a16af2ee0a10f4605d16cad77b95cba31a4997.tar.gz
linux-f2a16af2ee0a10f4605d16cad77b95cba31a4997.tar.bz2
linux-f2a16af2ee0a10f4605d16cad77b95cba31a4997.zip
phy: qcom-qmp: fix pipe-clock imbalance on power-on failure
[ Upstream commit 5e73b2d9867998278479ccc065a8a8227a5513ef ] Make sure to disable the pipe clock also if ufs-reset deassertion fails during power on. Note that the ufs-reset is asserted in qcom_qmp_phy_com_exit(). Fixes: c9b589791fc1 ("phy: qcom: Utilize UFS reset controller") Cc: Evan Green <evgreen@chromium.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20220502133130.4125-2-johan+linaro@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/phy/qualcomm')
-rw-r--r--drivers/phy/qualcomm/phy-qcom-qmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index ff5955fb4d8b..21d40c665854 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -1517,7 +1517,7 @@ static int qcom_qmp_phy_enable(struct phy *phy)
qcom_qmp_phy_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num);
ret = reset_control_deassert(qmp->ufs_reset);
if (ret)
- goto err_lane_rst;
+ goto err_pcs_ready;
/*
* Pull out PHY from POWER DOWN state.