Unverified Commit 9d7054fb authored by Neil Armstrong's avatar Neil Armstrong Committed by Mark Brown
Browse files

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: b59c1224 ("spi: spi-geni-qcom: Add support for GPI dma")
Fixes: 6532582c ("spi: spi-geni-qcom: fix error handling in spi_geni_grab_gpi_chan()")
Signed-off-by: default avatarNeil 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: default avatarMark Brown <broonie@kernel.org>
parent eee43699

drivers/spi/spi-geni-qcom.c

+2 −0
Original line number Diff line number Diff line
@@ -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