Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
-6
+2
-6
drivers/spi/spi-fsl-qspi.c
+2
-6
drivers/spi/spi-fsl-qspi.c
···
949
949
950
950
ret = devm_add_action_or_reset(dev, fsl_qspi_cleanup, q);
951
951
if (ret)
952
-
goto err_destroy_mutex;
952
+
goto err_put_ctrl;
953
953
954
954
ret = devm_spi_register_controller(dev, ctlr);
955
955
if (ret)
956
-
goto err_destroy_mutex;
956
+
goto err_put_ctrl;
957
957
958
958
return 0;
959
-
960
-
err_destroy_mutex:
961
-
mutex_destroy(&q->lock);
962
959
963
960
err_disable_clk:
964
961
fsl_qspi_clk_disable_unprep(q);
···
963
966
err_put_ctrl:
964
967
spi_controller_put(ctlr);
965
968
966
-
dev_err(dev, "Freescale QuadSPI probe failed\n");
967
969
return ret;
968
970
}
969
971