diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-11 20:48:47 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-11 20:48:47 +0300 |
| commit | dd91c555461261fed220ae29a508f508a0afeb43 (patch) | |
| tree | f3db2dd6e1a4db641a75b7bf300e88de563b22eb | |
| parent | bbf5c979011a099af5dc76498918ed7df445635b (diff) | |
| parent | 45f0bbdafd26d6d772172563b30bff561cec9133 (diff) | |
| download | linux-dd91c555461261fed220ae29a508f508a0afeb43.tar.xz | |
Merge remote-tracking branch 'spi/for-5.9' into spi-linus
| -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 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); |