Commit e42f1107 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

phy: qcom-qmp-pcie-msm8996: fix init-count imbalance 



The init counter is not decremented on initialisation errors, which
prevents retrying initialisation.

Add the missing decrement on initialisation errors so that the counter
reflects the state of the device.

Fixes: e78f3d15 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Cc: stable@vger.kernel.org      # 4.12
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230502103810.12061-3-johan+linaro@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 9bf03a0c

drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c

+3 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int qmp_pcie_msm8996_com_init(struct qmp_phy *qphy) 
	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);
@@ -409,7 +409,8 @@ static int qmp_pcie_msm8996_com_init(struct qmp_phy *qphy) 
	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;