Commit 3fa53518 authored by Frank Li's avatar Frank Li Committed by Vinod Koul
Browse files

dmaengine: fsl-edma: fix all channels requested when call fsl_edma3_xlate() 



dma_get_slave_channel() increases client_count for all channels. It should
only be called when a matched channel is found in fsl_edma3_xlate().

Move dma_get_slave_channel() after checking for a matched channel.

Cc: stable@vger.kernel.org
Fixes: 72f5801a ("dmaengine: fsl-edma: integrate v3 support")
Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20231004142911.838916-1-Frank.Li@nxp.com


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

drivers/dma/fsl-edma-main.c

+4 −2
Original line number Diff line number Diff line
@@ -154,18 +154,20 @@ static struct dma_chan *fsl_edma3_xlate(struct of_phandle_args *dma_spec, 
		fsl_chan = to_fsl_edma_chan(chan);

		i = fsl_chan - fsl_edma->chans;



		chan = dma_get_slave_channel(chan);

		chan->device->privatecnt++;

		fsl_chan->priority = dma_spec->args[1];

		fsl_chan->is_rxchan = dma_spec->args[2] & ARGS_RX;

		fsl_chan->is_remote = dma_spec->args[2] & ARGS_REMOTE;

		fsl_chan->is_multi_fifo = dma_spec->args[2] & ARGS_MULTI_FIFO;



		if (!b_chmux && i == dma_spec->args[0]) {

			chan = dma_get_slave_channel(chan);

			chan->device->privatecnt++;

			mutex_unlock(&fsl_edma->fsl_edma_mutex);

			return chan;

		} else if (b_chmux && !fsl_chan->srcid) {

			/* if controller support channel mux, choose a free channel */

			chan = dma_get_slave_channel(chan);

			chan->device->privatecnt++;

			fsl_chan->srcid = dma_spec->args[0];

			mutex_unlock(&fsl_edma->fsl_edma_mutex);

			return chan;