| From foo@baz Mon Jul 26 11:35:04 AM CEST 2021 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Sun, 9 May 2021 21:12:27 +0200 |
| Subject: spi: spi-fsl-dspi: Fix a resource leak in an error handling path |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| commit 680ec0549a055eb464dce6ffb4bfb736ef87236e upstream |
| |
| '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> |
| [sudip: adjust context] |
| Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/spi/spi-fsl-dspi.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/spi/spi-fsl-dspi.c |
| +++ b/drivers/spi/spi-fsl-dspi.c |
| @@ -1124,11 +1124,13 @@ static int dspi_probe(struct platform_de |
| ret = spi_register_master(master); |
| if (ret != 0) { |
| dev_err(&pdev->dev, "Problem registering DSPI master\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); |