Merge tag 'spi-fix-v6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

torvalds · torvalds · commit 2214170caabb · 2023-06-21T10:32:42.000-07:00
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()
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,8 @@ static int spi_geni_init(struct spi_geni_master *mas)`
`646`	`646`	`geni_se_select_mode(se, GENI_GPI_DMA);`
`647`	`647`	`dev_dbg(mas->dev, "Using GPI DMA mode for SPI\n");`
`648`	`648`	`break;`
	`649`	`+ } else if (ret == -EPROBE_DEFER) {`
	`650`	`+ goto out_pm;`
`649`	`651`	`}`
`650`	`652`	`/*`
`651`	`653`	`* in case of failure to get gpi dma channel, we can still do the`