From: Martin Povišer Date: Wed, 19 Oct 2022 13:23:23 +0000 (+0200) Subject: dmaengine: apple-admac: Fix grabbing of channels in of_xlate X-Git-Tag: v6.0.9~125 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e893b7debba6606fceafd8530bade7efbca09367;p=thirdparty%2Fkernel%2Fstable.git dmaengine: apple-admac: Fix grabbing of channels in of_xlate [ Upstream commit 8454f880c24bca0d9d4bfb6ed4a4a5429a4d9b20 ] The of_xlate callback is supposed to return the channel after already having 'grabbed' it for private use, so fill that in. Fixes: b127315d9a78 ("dmaengine: apple-admac: Add Apple ADMAC driver") Signed-off-by: Martin Povišer Link: https://lore.kernel.org/r/20221019132324.8585-1-povik+lin@cutebit.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c index d1f74a3aa999d..6780761a16403 100644 --- a/drivers/dma/apple-admac.c +++ b/drivers/dma/apple-admac.c @@ -490,7 +490,7 @@ static struct dma_chan *admac_dma_of_xlate(struct of_phandle_args *dma_spec, return NULL; } - return &ad->channels[index].chan; + return dma_get_slave_channel(&ad->channels[index].chan); } static int admac_drain_reports(struct admac_data *ad, int channo)