From 680ec0549a055eb464dce6ffb4bfb736ef87236e Mon Sep 17 00:00:00 2001

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Date: Sun, 9 May 2021 21:12:27 +0200

Subject: [PATCH] spi: spi-fsl-dspi: Fix a resource leak in an error handling path

Git-commit: 680ec0549a055eb464dce6ffb4bfb736ef87236e

Patch-mainline: v5.13 or v5.13-rc4 (next release)

References: git-fixes

'dspi_request_dma()' should be undone by a 'dspi_release_dma()' call in the

error handling path of the probe function, as already done in the remove

function

Fixes: 90ba37033cb9 ("spi: spi-fsl-dspi: Add DMA support for Vybrid")

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Reviewed-by: Vladimir Oltean <olteanv@gmail.com>

Link: https://lore.kernel.org/r/d51caaac747277a1099ba8dea07acd85435b857e.1620587472.git.christophe.jaillet@wanadoo.fr

Signed-off-by: Mark Brown <broonie@kernel.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/spi/spi-fsl-dspi.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c

index 028736687488..fb45e6af6638 100644

--- a/drivers/spi/spi-fsl-dspi.c

+++ b/drivers/spi/spi-fsl-dspi.c

@@ -1375,11 +1375,13 @@ static int dspi_probe(struct platform_device *pdev)

 	ret = spi_register_controller(ctlr);

 	if (ret != 0) {

 		dev_err(&pdev->dev, "Problem registering DSPI ctlr\n");

-		goto out_free_irq;

+		goto out_release_dma;

 	}

 	return ret;

+out_release_dma:

+	dspi_release_dma(dspi);

 out_free_irq:

 	if (dspi->irq)

 		free_irq(dspi->irq, dspi);

-- 

2.26.2