Skip to content

Commit e618ee8

Browse files
committed
Merge tag 'spi-fix-v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown: "A couple of cleanups for the error handling in the Freescale drivers" * tag 'spi-fix-v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: fsl-spi: Remove redundant probe error message spi: fsl-qspi: Fix double cleanup in probe error path
2 parents 2f3e5ef + 82bedbf commit e618ee8

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/spi/spi-fsl-qspi.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -949,24 +949,20 @@ static int fsl_qspi_probe(struct platform_device *pdev)
949949

950950
ret = devm_add_action_or_reset(dev, fsl_qspi_cleanup, q);
951951
if (ret)
952-
goto err_destroy_mutex;
952+
goto err_put_ctrl;
953953

954954
ret = devm_spi_register_controller(dev, ctlr);
955955
if (ret)
956-
goto err_destroy_mutex;
956+
goto err_put_ctrl;
957957

958958
return 0;
959959

960-
err_destroy_mutex:
961-
mutex_destroy(&q->lock);
962-
963960
err_disable_clk:
964961
fsl_qspi_clk_disable_unprep(q);
965962

966963
err_put_ctrl:
967964
spi_controller_put(ctlr);
968965

969-
dev_err(dev, "Freescale QuadSPI probe failed\n");
970966
return ret;
971967
}
972968

0 commit comments

Comments
 (0)