Skip to content

Commit

Permalink
spi: fsl-qspi: Fix double cleanup in probe error path
Browse files Browse the repository at this point in the history
Commit 40369bf ("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: 40369bf ("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>
  • Loading branch information
Kevin Hao authored and Mark Brown committed Apr 10, 2025
1 parent 0af2f6b commit 5d07ab2
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/spi/spi-fsl-qspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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);

Expand Down

0 comments on commit 5d07ab2

Please sign in to comment.