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

phy: qcom-qmp-pcie-msm8996: fix memleak on probe deferral 



Switch to using the device-managed of_iomap helper to avoid leaking
memory on probe deferral and driver unbind.

Note that this helper checks for already reserved regions and may fail
if there are multiple devices claiming the same memory.

Fixes: e78f3d15 ("phy: qcom-qmp: new qmp phy driver for qcom-chipsets")
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220916102340.11520-4-johan+linaro@kernel.org


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

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

+11 −12
Original line number Diff line number Diff line
@@ -796,21 +796,20 @@ static int qmp_pcie_msm8996_create(struct device *dev, struct device_node *np, i 
	 * For dual lane PHYs: tx2 -> 3, rx2 -> 4, pcs_misc (optional) -> 5

	 * For single lane PHYs: pcs_misc (optional) -> 3.

	 */

	qphy->tx = of_iomap(np, 0);

	if (!qphy->tx)

		return -ENOMEM;



	qphy->rx = of_iomap(np, 1);

	if (!qphy->rx)

		return -ENOMEM;

	qphy->tx = devm_of_iomap(dev, np, 0, NULL);

	if (IS_ERR(qphy->tx))

		return PTR_ERR(qphy->tx);



	qphy->pcs = of_iomap(np, 2);

	if (!qphy->pcs)

		return -ENOMEM;

	qphy->rx = devm_of_iomap(dev, np, 1, NULL);

	if (IS_ERR(qphy->rx))

		return PTR_ERR(qphy->rx);



	qphy->pcs_misc = of_iomap(np, 3);

	qphy->pcs = devm_of_iomap(dev, np, 2, NULL);

	if (IS_ERR(qphy->pcs))

		return PTR_ERR(qphy->pcs);



	if (!qphy->pcs_misc)

	qphy->pcs_misc = devm_of_iomap(dev, np, 3, NULL);

	if (IS_ERR(qphy->pcs_misc))

		dev_vdbg(dev, "PHY pcs_misc-reg not used\n");



	qphy->pipe_clk = devm_get_clk_from_child(dev, np, NULL);