spi: fsl-qspi: Fix double cleanup in probe error path

commit 5d07ab2a7fa1305e429d9221716582f290b58078 upstream.

Commit 40369bfe717e ("spi: fsl-qspi: use devm function instead of driver
remove") introduced managed cleanup via fsl_qspi_cleanup(), but
incorrectly retain manual cleanup in two scenarios:

- On devm_add_action_or_reset() failure, the function automatically call
  fsl_qspi_cleanup(). However, the current code still jumps to
  err_destroy_mutex, repeating cleanup.

- After the fsl_qspi_cleanup() action is added successfully, there is no
  need to manually perform the cleanup in the subsequent error path.
  However, the current code still jumps to err_destroy_mutex on spi
  controller failure, repeating cleanup.

Skip redundant manual cleanup calls to fix these issues.

Cc: stable@vger.kernel.org
Fixes: 40369bfe717e ("spi: fsl-qspi: use devm function instead of driver remove")
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Link: https://patch.msgid.link/20250410-spi-v1-1-56e867cc19cf@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c
index 310350d2c530282fdbe4bc63ee6630bff5698da2..21e357966d2a22f7db1ab4b42f70cc821849d285 100644 (file)
--- a/drivers/spi/spi-fsl-qspi.c
+++ b/drivers/spi/spi-fsl-qspi.c
@@ -943,17 +943,14 @@ static int fsl_qspi_probe(struct platform_device *pdev)
 
        ret = devm_add_action_or_reset(dev, fsl_qspi_cleanup, q);
        if (ret)
-               goto err_destroy_mutex;
+               goto err_put_ctrl;
 
        ret = devm_spi_register_controller(dev, ctlr);
        if (ret)
-               goto err_destroy_mutex;
+               goto err_put_ctrl;
 
        return 0;
 
-err_destroy_mutex:
-       mutex_destroy(&q->lock);
-
 err_disable_clk:
        fsl_qspi_clk_disable_unprep(q);