diff options
| author | Mark Brown <broonie@kernel.org> | 2020-10-28 22:36:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-28 22:36:51 +0100 |
| commit | 3bfd5f422f07a10f485c3f046431783c7c4004f2 (patch) | |
| tree | 7e990a251c825482216a0355177ef80874b3c0cb /drivers/spi/spi-imx.c | |
| parent | spi: imx: fix runtime pm support for !CONFIG_PM (diff) | |
| parent | Linux 5.10-rc1 (diff) | |
| download | linux-3bfd5f422f07a10f485c3f046431783c7c4004f2.tar.xz linux-3bfd5f422f07a10f485c3f046431783c7c4004f2.zip | |
Merge tag 'v5.10-rc1' into spi-5.10
Linux 5.10-rc1
Diffstat (limited to 'drivers/spi/spi-imx.c')
| -rw-r--r-- | drivers/spi/spi-imx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 95be1b20af32..4b80e27ecdbf 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -1712,7 +1712,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; } pm_runtime_mark_last_busy(spi_imx->dev); @@ -1720,6 +1720,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_set_suspended(&pdev->dev); |