diff options
author | Johan Hovold <johan+linaro@kernel.org> | 2023-05-02 12:38:09 +0200 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2023-05-08 14:39:42 +0530 |
commit | 9bf03a0cbd80a256bc1e1c4bcc80bc2b06b8b2b9 (patch) | |
tree | bf0a96bd1253ce2bc2a635d7e7c3262b1d342a11 /drivers/phy/qualcomm | |
parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
download | linux-9bf03a0cbd80a256bc1e1c4bcc80bc2b06b8b2b9.tar.gz linux-9bf03a0cbd80a256bc1e1c4bcc80bc2b06b8b2b9.tar.bz2 linux-9bf03a0cbd80a256bc1e1c4bcc80bc2b06b8b2b9.zip |
phy: qcom-qmp-combo: fix init-count imbalance
The init counter is not decremented on initialisation errors, which
prevents retrying initialisation and can lead to the runtime suspend
callback attempting to disable resources that have never been enabled.
Add the missing decrement on initialisation errors so that the counter
reflects the state of the device.
Fixes: e78f3d15e115 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Cc: stable@vger.kernel.org # 4.12
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230502103810.12061-2-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/phy/qualcomm')
-rw-r--r-- | drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 6850e04c329b..87b17e5877ab 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2472,7 +2472,7 @@ static int qmp_combo_com_init(struct qmp_combo *qmp) ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs); if (ret) { dev_err(qmp->dev, "failed to enable regulators, err=%d\n", ret); - goto err_unlock; + goto err_decrement_count; } ret = reset_control_bulk_assert(cfg->num_resets, qmp->resets); @@ -2522,7 +2522,8 @@ err_assert_reset: reset_control_bulk_assert(cfg->num_resets, qmp->resets); err_disable_regulators: regulator_bulk_disable(cfg->num_vregs, qmp->vregs); -err_unlock: +err_decrement_count: + qmp->init_count--; mutex_unlock(&qmp->phy_mutex); return ret; |