Skip to content

Commit 2701654

Browse files
haokexingregkh
authored andcommitted
spi: fsl-qspi: Fix double cleanup in probe error path
[ Upstream commit 5d07ab2 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 07836bc commit 2701654

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/spi/spi-fsl-qspi.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -943,17 +943,14 @@ static int fsl_qspi_probe(struct platform_device *pdev)
943943

944944
ret = devm_add_action_or_reset(dev, fsl_qspi_cleanup, q);
945945
if (ret)
946-
goto err_destroy_mutex;
946+
goto err_put_ctrl;
947947

948948
ret = devm_spi_register_controller(dev, ctlr);
949949
if (ret)
950-
goto err_destroy_mutex;
950+
goto err_put_ctrl;
951951

952952
return 0;
953953

954-
err_destroy_mutex:
955-
mutex_destroy(&q->lock);
956-
957954
err_disable_clk:
958955
fsl_qspi_clk_disable_unprep(q);
959956

0 commit comments

Comments
 (0)