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

Commit 9b448226 authored by Swati Agarwal's avatar Swati Agarwal Committed by Greg Kroah-Hartman
Browse files

dmaengine: xilinx_dma: Fix devm_platform_ioremap_resource error handling 



[ Upstream commit 91df7751eb890e970afc08f50b8f0fa5ea39e03d ]

Add missing cleanup in devm_platform_ioremap_resource().
When probe fails remove dma channel resources and disable clocks in
accordance with the order of resources allocated .

Signed-off-by: default avatarSwati Agarwal <swati.agarwal@xilinx.com>
Link: https://lore.kernel.org/r/20220817061125.4720-2-swati.agarwal@xilinx.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Stable-dep-of: 596b53ccc36a ("dmaengine: xilinx_dma: call of_node_put() when breaking out of for_each_child_of_node()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fe39e74a

drivers/dma/xilinx/xilinx_dma.c

+7 −6
Original line number Diff line number Diff line
@@ -2652,9 +2652,10 @@ static int xilinx_dma_probe(struct platform_device *pdev) 


	/* Request and map I/O memory */

	xdev->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(xdev->regs))

		return PTR_ERR(xdev->regs);



	if (IS_ERR(xdev->regs)) {

		err = PTR_ERR(xdev->regs);

		goto disable_clks;

	}

	/* Retrieve the DMA engine properties from the device tree */

	xdev->max_buffer_len = GENMASK(XILINX_DMA_MAX_TRANS_LEN_MAX - 1, 0);
@@ -2747,7 +2748,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) 
	for_each_child_of_node(node, child) {

		err = xilinx_dma_child_probe(xdev, child);

		if (err < 0)

			goto disable_clks;

			goto error;

	}



	if (xdev->dma_config->dmatype == XDMA_TYPE_VDMA) {
@@ -2780,12 +2781,12 @@ static int xilinx_dma_probe(struct platform_device *pdev) 


	return 0;



disable_clks:

	xdma_disable_allclks(xdev);

error:

	for (i = 0; i < xdev->nr_channels; i++)

		if (xdev->chan[i])

			xilinx_dma_chan_remove(xdev->chan[i]);

disable_clks:

	xdma_disable_allclks(xdev);



	return err;

}