diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-21 10:32:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-21 10:32:42 -0700 |
| commit | 2214170caabbff673935eb046a7edf4621213931 (patch) | |
| tree | ea64ef11dae981ae00228fb034394e492923c989 | |
| parent | 6e6fb54de1ef34fd20a0bdd99ce72a657814391b (diff) | |
| parent | 9d7054fb3ac2e8d252aae1268f20623f244e644f (diff) | |
| download | ps3-linux-2214170caabbff673935eb046a7edf4621213931.tar.gz | |
Merge tag 'spi-fix-v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fix from Mark Brown:
"One last fix for SPI, just a simple fix for incorrect handling of
probe deferral for DMA in the Qualcomm GENI driver"
* tag 'spi-fix-v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan()
| -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 a98b781b103ab3..b293428760bc64 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 |