mirror of
https://github.com/torvalds/linux.git
synced 2024-10-24 14:10:59 +00:00
spi: Fix for v5.9
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) plus an update to MAINTAINERS reflecting Serge's extensive and detailed recent work on the DesignWare driver. -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl+A7v4ACgkQJNaLcl1U h9C4wgf/Uueuh7a92KHslaVbH9NisM80NimbWXmVAMHQ7oTpRPQg84CV+/a6glbc 33aaCKcSDA8Tgww6n6uSXDZCwgjQ5WuXI7yDVDoE/wDC2p0uD8jC3Sz0hV2OU+37 8MGaYHONdKFELKZTXLnKU7J1yWzwHiWFDdkzZaAOabI80e1Ar2XyLkXDikOZVB6+ 65c9pmF1V9tcMxuLyqceTqP6ilTt8MmsgOMr/d+w7hjEmtx3WH7ghv/eAU8cOUgf kVPsEvdyAY9EXlGAZ7g9b5G1SqUs1KJK37HvfdVdq8LoLzwbQON1K6welqXk9Y6h v5uFRg13kw1MDPR84nFANhWPGMekTA== =pg9I -----END PGP SIGNATURE----- Merge tag 'spi-fix-v5.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 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
This commit is contained in:
commit
6f2f486d57
|
@ -16732,6 +16732,13 @@ S: Maintained
|
||||||
F: Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
|
F: Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
|
||||||
F: drivers/gpio/gpio-dwapb.c
|
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
|
SYNOPSYS DESIGNWARE AXI DMAC DRIVER
|
||||||
M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
|
M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
|
@ -1281,6 +1281,9 @@ static int dspi_probe(struct platform_device *pdev)
|
||||||
if (!ctlr)
|
if (!ctlr)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
spi_controller_set_devdata(ctlr, dspi);
|
||||||
|
platform_set_drvdata(pdev, dspi);
|
||||||
|
|
||||||
dspi->pdev = pdev;
|
dspi->pdev = pdev;
|
||||||
dspi->ctlr = ctlr;
|
dspi->ctlr = ctlr;
|
||||||
|
|
||||||
|
@ -1417,8 +1420,6 @@ poll_mode:
|
||||||
if (dspi->devtype_data->trans_mode != DSPI_DMA_MODE)
|
if (dspi->devtype_data->trans_mode != DSPI_DMA_MODE)
|
||||||
ctlr->ptp_sts_supported = true;
|
ctlr->ptp_sts_supported = true;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, dspi);
|
|
||||||
|
|
||||||
ret = spi_register_controller(ctlr);
|
ret = spi_register_controller(ctlr);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
dev_err(&pdev->dev, "Problem registering DSPI ctlr\n");
|
dev_err(&pdev->dev, "Problem registering DSPI ctlr\n");
|
||||||
|
|
Loading…
Reference in New Issue
Block a user