diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-10 04:05:12 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-10 04:05:12 +0300 |
| commit | 6f2f486d57c4d562cdf4932320b66fbb878ab1c4 (patch) | |
| tree | 568e8d75f9462f681224f7daf8896643e09e392c | |
| parent | 8a5f78d98c26c8e2a79ea37224435d2b434453e1 (diff) | |
| parent | 1c33524f79853f41e80390b1a223254aadd30bd4 (diff) | |
| download | linux-6f2f486d57c4d562cdf4932320b66fbb878ab1c4.tar.xz | |
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
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9a54806ebf02..e83aee101b66 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 127323a4b27c..108a7d50d2c3 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -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"); |