Merge tag 'spi-fix-v5.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (6f2f486d) · Commits · 戴 / test

Pull spi fix from Mark Brown: "One last minute fix for v5.9 which has been causing crashes in test systems with the fsl-dspi driver when they hit deferred probe (and which I probably let cook in next a bit longer than is ideal). And an update to MAINTAINERS reflecting Serge's extensive and detailed recent work on the DesignWare driver" * tag 'spi-fix-v5.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: MAINTAINERS: Add maintainer of DW APB SSI driver spi: fsl-dspi: fix NULL pointer dereference

MAINTAINERS

+7 −0

Original line number	Diff line number	Diff line
		@@ -16732,6 +16732,13 @@ S: Maintained
		F: Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
		F: drivers/gpio/gpio-dwapb.c

		SYNOPSYS DESIGNWARE APB SSI DRIVER
		M: Serge Semin <fancer.lancer@gmail.com>
		L: linux-spi@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
		F: drivers/spi/spi-dw*

		SYNOPSYS DESIGNWARE AXI DMAC DRIVER
		M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
		S: Maintained

drivers/spi/spi-fsl-dspi.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1281,6 +1281,9 @@ static int dspi_probe(struct platform_device *pdev)
		if (!ctlr)
		return -ENOMEM;

		spi_controller_set_devdata(ctlr, dspi);
		platform_set_drvdata(pdev, dspi);

		dspi->pdev = pdev;
		dspi->ctlr = ctlr;

		@@ -1417,8 +1420,6 @@ poll_mode:
		if (dspi->devtype_data->trans_mode != DSPI_DMA_MODE)
		ctlr->ptp_sts_supported = true;

		platform_set_drvdata(pdev, dspi);

		ret = spi_register_controller(ctlr);
		if (ret != 0) {
		dev_err(&pdev->dev, "Problem registering DSPI ctlr\n");

Admin message