dmaengine: cppi41: Fix an Oops happening in cppi41_dma_probe() (eda6f4e8) · Commits · 戴 / test

This fix an Oops happening on all platforms using the old dt bindings (all platforms but da8xx). This update cppi41_dma_probe() to use the index variable which is required to keep compatibility between old and new dt bindings. Fixes: ("dmaengine: cppi41: use managed functions devm_*()") Reported-by:

Tony Lindgren <tony@atomide.com> Signed-off-by:

Alexandre Bailon <abailon@baylibre.com> Signed-off-by:

Vinod Koul <vinod.koul@intel.com>

drivers/dma/cppi41.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1038,17 +1038,17 @@ static int cppi41_dma_probe(struct platform_device *pdev)
		if (index < 0)
		return index;

		mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		mem = platform_get_resource(pdev, IORESOURCE_MEM, index);
		cdd->ctrl_mem = devm_ioremap_resource(dev, mem);
		if (IS_ERR(cdd->ctrl_mem))
		return PTR_ERR(cdd->ctrl_mem);

		mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
		mem = platform_get_resource(pdev, IORESOURCE_MEM, index + 1);
		cdd->sched_mem = devm_ioremap_resource(dev, mem);
		if (IS_ERR(cdd->sched_mem))
		return PTR_ERR(cdd->sched_mem);

		mem = platform_get_resource(pdev, IORESOURCE_MEM, 2);
		mem = platform_get_resource(pdev, IORESOURCE_MEM, index + 2);
		cdd->qmgr_mem = devm_ioremap_resource(dev, mem);
		if (IS_ERR(cdd->qmgr_mem))
		return PTR_ERR(cdd->qmgr_mem);

Admin message