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

Commit eda6f4e8 authored by Alexandre Bailon's avatar Alexandre Bailon Committed by Vinod Koul
Browse files

dmaengine: cppi41: Fix an Oops happening in cppi41_dma_probe() 



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: 8e3ba95f ("dmaengine: cppi41: use managed functions devm_*()")
Reported-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarAlexandre Bailon <abailon@baylibre.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent d7fd724e

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);