Commit 5b2aa9f9 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: of-dma: Fix of_dma_router_xlate's of_dma_xlate handling 



of_dma_xlate callback can return ERR_PTR as well NULL in case of failure.

If error code is returned (not NULL) then the route should be released and
the router should not be registered for the channel.

Fixes: 56f13c0d ("dmaengine: of_dma: Support for DMA routers")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20200806104928.25975-1-peter.ujfalusi@ti.com


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

drivers/dma/of-dma.c

+4 −4
Original line number Diff line number Diff line
@@ -71,12 +71,12 @@ static struct dma_chan *of_dma_router_xlate(struct of_phandle_args *dma_spec, 
		return NULL;



	chan = ofdma_target->of_dma_xlate(&dma_spec_target, ofdma_target);

	if (chan) {

		chan->router = ofdma->dma_router;

		chan->route_data = route_data;

	} else {

	if (IS_ERR_OR_NULL(chan)) {

		ofdma->dma_router->route_free(ofdma->dma_router->dev,

					      route_data);

	} else {

		chan->router = ofdma->dma_router;

		chan->route_data = route_data;

	}



	/*