diff options
| author | Mark Brown <broonie@kernel.org> | 2020-10-09 16:01:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-09 16:01:20 +0100 |
| commit | d4f3a651ab82685c63e6fb38bec20b3ccf08c085 (patch) | |
| tree | 456a9d42dfe722fc2a2df748e4f3a555814c04bf /drivers | |
| parent | 549738f15da0e5a00275977623be199fbbf7df50 (diff) | |
| parent | 45f0bbdafd26d6d772172563b30bff561cec9133 (diff) | |
| download | lwn-d4f3a651ab82685c63e6fb38bec20b3ccf08c085.tar.gz lwn-d4f3a651ab82685c63e6fb38bec20b3ccf08c085.zip | |
Merge remote-tracking branch 'spi/for-5.9' into spi-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 5 | ||||
| -rw-r--r-- | drivers/spi/spi-imx.c | 5 |
2 files changed, 7 insertions, 3 deletions
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"); diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 38a5f1304cec..e38e5ad3c706 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1707,7 +1707,7 @@ static int spi_imx_probe(struct platform_device *pdev) ret = spi_bitbang_start(&spi_imx->bitbang); if (ret) { dev_err(&pdev->dev, "bitbang start failed with %d\n", ret); - goto out_runtime_pm_put; + goto out_bitbang_start; } dev_info(&pdev->dev, "probed\n"); @@ -1717,6 +1717,9 @@ static int spi_imx_probe(struct platform_device *pdev) return ret; +out_bitbang_start: + if (spi_imx->devtype_data->has_dmamode) + spi_imx_sdma_exit(spi_imx); out_runtime_pm_put: pm_runtime_dont_use_autosuspend(spi_imx->dev); pm_runtime_put_sync(spi_imx->dev); |