Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ac21b24 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

phy: qcom-qmp: fix reset-controller leak on probe errors 



commit 4d2900f20edfe541f75756a00deeb2ffe7c66bc1 upstream.

Make sure to release the lane reset controller in case of a late probe
error (e.g. probe deferral).

Note that due to the reset controller being defined in devicetree in
"lane" child nodes, devm_reset_control_get_exclusive() cannot be used
directly.

Fixes: e78f3d15 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Cc: stable@vger.kernel.org      # 4.12
Cc: Vivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220427063243.32576-3-johan+linaro@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d19fa8f2

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

+9 −0
Original line number Diff line number Diff line
@@ -1860,6 +1860,11 @@ static const struct phy_ops qcom_qmp_ufs_ops = { 
	.owner		= THIS_MODULE,

};



static void qcom_qmp_reset_control_put(void *data)

{

	reset_control_put(data);

}



static

int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)

{
@@ -1951,6 +1956,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id) 
			dev_err(dev, "failed to get lane%d reset\n", id);

			return PTR_ERR(qphy->lane_rst);

		}

		ret = devm_add_action_or_reset(dev, qcom_qmp_reset_control_put,

					       qphy->lane_rst);

		if (ret)

			return ret;

	}



	if (qmp->cfg->type == PHY_TYPE_UFS)