On Thu, Apr 10, 2025 at 02:56:09PM +0800, Kevin Hao wrote:
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
drivers/spi/spi-fsl-qspi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c index 5c59fddb32c1b9cc030e7abb49484662ec7b382c..2f54dc09d11b1c56cfe57ceec8452fbb29322d3f 100644 --- a/drivers/spi/spi-fsl-qspi.c +++ b/drivers/spi/spi-fsl-qspi.c @@ -949,17 +949,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;
fsl_qspi_cleanup() already included mutex_destroy() and fsl_qspi_clk_disable_unprep()
simple return ret;
ret = devm_spi_register_controller(dev, ctlr); if (ret)
goto err_destroy_mutex;
goto err_put_ctrl;
return ret;
return 0;
-err_destroy_mutex:
- mutex_destroy(&q->lock);
err_disable_clk: fsl_qspi_clk_disable_unprep(q);
remove these two labels
Frank
-- 2.49.0