spi: spi-fsl-lpspi: remove redundant spi_controller_put call

devm_spi_alloc_controller will allocate an SPI controller and
automatically release a reference on it when dev is unbound from
its driver. It doesn't need to call spi_controller_put explicitly
to put the reference when lpspi driver failed initialization.

Fixes: 2ae0ab0143fc ("spi: lpspi: Avoid potential use-after-free in probe()")
Signed-off-by: Carlos Song <carlos.song@nxp.com>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@siemens.com>
Link: https://msgid.link/r/20240403084029.2000544-1-carlos.song@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
index 079035db7dd8592aa62a21d5e88480028c5941bb..92a662d1b55cf2ed044fcbbfe96fd03ef0035736 100644 (file)
--- a/drivers/spi/spi-fsl-lpspi.c
+++ b/drivers/spi/spi-fsl-lpspi.c
@@ -852,39 +852,39 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
        fsl_lpspi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
        if (IS_ERR(fsl_lpspi->base)) {
                ret = PTR_ERR(fsl_lpspi->base);
-               goto out_controller_put;
+               return ret;
        }
        fsl_lpspi->base_phys = res->start;
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
                ret = irq;
-               goto out_controller_put;
+               return ret;
        }
 
        ret = devm_request_irq(&pdev->dev, irq, fsl_lpspi_isr, 0,
                               dev_name(&pdev->dev), fsl_lpspi);
        if (ret) {
                dev_err(&pdev->dev, "can't get irq%d: %d\n", irq, ret);
-               goto out_controller_put;
+               return ret;
        }
 
        fsl_lpspi->clk_per = devm_clk_get(&pdev->dev, "per");
        if (IS_ERR(fsl_lpspi->clk_per)) {
                ret = PTR_ERR(fsl_lpspi->clk_per);
-               goto out_controller_put;
+               return ret;
        }
 
        fsl_lpspi->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
        if (IS_ERR(fsl_lpspi->clk_ipg)) {
                ret = PTR_ERR(fsl_lpspi->clk_ipg);
-               goto out_controller_put;
+               return ret;
        }
 
        /* enable the clock */
        ret = fsl_lpspi_init_rpm(fsl_lpspi);
        if (ret)
-               goto out_controller_put;
+               return ret;
 
        ret = pm_runtime_get_sync(fsl_lpspi->dev);
        if (ret < 0) {
@@ -945,8 +945,6 @@ out_pm_get:
        pm_runtime_dont_use_autosuspend(fsl_lpspi->dev);
        pm_runtime_put_sync(fsl_lpspi->dev);
        pm_runtime_disable(fsl_lpspi->dev);
-out_controller_put:
-       spi_controller_put(controller);
 
        return ret;
 }