diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2020-12-12 17:06:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-04 09:39:43 +0100 |
| commit | fdaafae0fcd958832dd1f114ce58466fdcd49264 (patch) | |
| tree | f92700396aa14b86773b440bf8bafc8314ee78be /drivers/dma | |
| parent | f2efd906656cbf6ddde4e87648a63b2eb4cd09ba (diff) | |
| download | linux-stable-fdaafae0fcd958832dd1f114ce58466fdcd49264.tar.gz linux-stable-fdaafae0fcd958832dd1f114ce58466fdcd49264.tar.bz2 linux-stable-fdaafae0fcd958832dd1f114ce58466fdcd49264.zip | |
dmaengine: fsldma: Fix a resource leak in an error handling path of the probe function
[ Upstream commit b202d4e82531a62a33a6b14d321dd2aad491578e ]
In case of error, the previous 'fsl_dma_chan_probe()' calls must be undone
by some 'fsl_dma_chan_remove()', as already done in the remove function.
It was added in the remove function in commit 77cd62e8082b ("fsldma: allow
Freescale Elo DMA driver to be compiled as a module")
Fixes: d3f620b2c4fe ("fsldma: simplify IRQ probing and handling")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20201212160614.92576-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/fsldma.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index e3412be95712..e7ca3175dbc3 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -1218,6 +1218,7 @@ static int fsldma_of_probe(struct platform_device *op) { struct fsldma_device *fdev; struct device_node *child; + unsigned int i; int err; fdev = kzalloc(sizeof(*fdev), GFP_KERNEL); @@ -1296,6 +1297,10 @@ static int fsldma_of_probe(struct platform_device *op) return 0; out_free_fdev: + for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) { + if (fdev->chan[i]) + fsl_dma_chan_remove(fdev->chan[i]); + } irq_dispose_mapping(fdev->irq); iounmap(fdev->regs); out_free: |