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

dmaengine: sh: rz-dmac: fix device leak on probe failure 



Make sure to drop the reference taken when looking up the ICU device
during probe also on probe failures (e.g. probe deferral).

Fixes: 7de87320 ("dmaengine: sh: rz-dmac: Add RZ/V2H(P) support")
Cc: stable@vger.kernel.org	# 6.16
Cc: Fabrizio Castro <fabrizio.castro.jz@renesas.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarFabrizio Castro <fabrizio.castro.jz@renesas.com>
Link: https://patch.msgid.link/20251117161258.10679-10-johan@kernel.org


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

drivers/dma/sh/rz-dmac.c

+11 −2
Original line number Diff line number Diff line
@@ -854,6 +854,13 @@ static int rz_dmac_chan_probe(struct rz_dmac *dmac, 
	return 0;

}



static void rz_dmac_put_device(void *_dev)

{

	struct device *dev = _dev;



	put_device(dev);

}



static int rz_dmac_parse_of_icu(struct device *dev, struct rz_dmac *dmac)

{

	struct device_node *np = dev->of_node;
@@ -876,6 +883,10 @@ static int rz_dmac_parse_of_icu(struct device *dev, struct rz_dmac *dmac) 
		return -ENODEV;

	}



	ret = devm_add_action_or_reset(dev, rz_dmac_put_device, &dmac->icu.pdev->dev);

	if (ret)

		return ret;



	dmac_index = args.args[0];

	if (dmac_index > RZV2H_MAX_DMAC_INDEX) {

		dev_err(dev, "DMAC index %u invalid.\n", dmac_index);
@@ -1055,8 +1066,6 @@ static void rz_dmac_remove(struct platform_device *pdev) 
	reset_control_assert(dmac->rstc);

	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	platform_device_put(dmac->icu.pdev);

}



static const struct of_device_id of_rz_dmac_match[] = {