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

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: 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-2-johan+linaro@kernel.org


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

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

+3 −2
Original line number Diff line number Diff line
@@ -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 @@ static int qmp_combo_com_init(struct qmp_combo *qmp) 
	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;