diff options
| author | Neil Armstrong <neil.armstrong@linaro.org> | 2023-06-15 14:51:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-06-19 13:59:48 +0200 |
| commit | 337207408f74a8374beacf232ec1e08742c1d98f (patch) | |
| tree | 9c91dbf45bec9564eeeb34c8ae34f477b3c38ba6 /drivers/spi/spi-geni-qcom.c | |
| parent | spi: stm32: disable spi-slave property for stm32f4-f7 (diff) | |
| download | linux-337207408f74a8374beacf232ec1e08742c1d98f.tar.xz linux-337207408f74a8374beacf232ec1e08742c1d98f.zip | |
spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan()
Now spi_geni_grab_gpi_chan() errors are correctly reported, the
-EPROBE_DEFER error should be returned from probe in case the
GPI dma driver is built as module and/or not probed yet.
Fixes: b59c122484ec ("spi: spi-geni-qcom: Add support for GPI dma")
Fixes: 6532582c353f ("spi: spi-geni-qcom: fix error handling in spi_geni_grab_gpi_chan()")
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230615-topic-sm8550-upstream-fix-spi-geni-qcom-probe-v2-1-670c3d9e8c9c@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-geni-qcom.c')
| -rw-r--r-- | drivers/spi/spi-geni-qcom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index e423efcf016f..08672a961fbb 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -646,6 +646,8 @@ static int spi_geni_init(struct spi_geni_master *mas) geni_se_select_mode(se, GENI_GPI_DMA); dev_dbg(mas->dev, "Using GPI DMA mode for SPI\n"); break; + } else if (ret == -EPROBE_DEFER) { + goto out_pm; } /* * in case of failure to get gpi dma channel, we can still do the |