Skip to content

Commit fa70c4c

Browse files
MrVanvinodkoul
authored andcommitted
dmaengine: fsl-edma: free irq correctly in remove path
Add fsl_edma->txirq/errirq check to avoid below warning because no errirq at i.MX9 platform. Otherwise there will be kernel dump: WARNING: CPU: 0 PID: 11 at kernel/irq/devres.c:144 devm_free_irq+0x74/0x80 Modules linked in: CPU: 0 UID: 0 PID: 11 Comm: kworker/u8:0 Not tainted 6.12.0-rc7#18 Hardware name: NXP i.MX93 11X11 EVK board (DT) Workqueue: events_unbound deferred_probe_work_func pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : devm_free_irq+0x74/0x80 lr : devm_free_irq+0x48/0x80 Call trace: devm_free_irq+0x74/0x80 (P) devm_free_irq+0x48/0x80 (L) fsl_edma_remove+0xc4/0xc8 platform_remove+0x28/0x44 device_remove+0x4c/0x80 Fixes: 44eb827 ("dmaengine: fsl-edma: request per-channel IRQ only when channel is allocated") Reviewed-by: Frank Li <Frank.Li@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> Link: https://lore.kernel.org/r/20250228071720.3780479-2-peng.fan@oss.nxp.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent c9c59da commit fa70c4c

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

drivers/dma/fsl-edma-main.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ fsl_edma2_irq_init(struct platform_device *pdev,
401401

402402
/* The last IRQ is for eDMA err */
403403
if (i == count - 1) {
404+
fsl_edma->errirq = irq;
404405
ret = devm_request_irq(&pdev->dev, irq,
405406
fsl_edma_err_handler,
406407
0, "eDMA2-ERR", fsl_edma);
@@ -420,10 +421,13 @@ static void fsl_edma_irq_exit(
420421
struct platform_device *pdev, struct fsl_edma_engine *fsl_edma)
421422
{
422423
if (fsl_edma->txirq == fsl_edma->errirq) {
423-
devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
424+
if (fsl_edma->txirq >= 0)
425+
devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
424426
} else {
425-
devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
426-
devm_free_irq(&pdev->dev, fsl_edma->errirq, fsl_edma);
427+
if (fsl_edma->txirq >= 0)
428+
devm_free_irq(&pdev->dev, fsl_edma->txirq, fsl_edma);
429+
if (fsl_edma->errirq >= 0)
430+
devm_free_irq(&pdev->dev, fsl_edma->errirq, fsl_edma);
427431
}
428432
}
429433

@@ -620,6 +624,8 @@ static int fsl_edma_probe(struct platform_device *pdev)
620624
if (!fsl_edma)
621625
return -ENOMEM;
622626

627+
fsl_edma->errirq = -EINVAL;
628+
fsl_edma->txirq = -EINVAL;
623629
fsl_edma->drvdata = drvdata;
624630
fsl_edma->n_chans = chans;
625631
mutex_init(&fsl_edma->fsl_edma_mutex);

0 commit comments

Comments
 (0)