diff options
| -rw-r--r-- | Documentation/devicetree/bindings/spi/st,stm32-spi.yaml | 1 | ||||
| -rw-r--r-- | drivers/spi/spi-geni-qcom.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/st,stm32-spi.yaml b/Documentation/devicetree/bindings/spi/st,stm32-spi.yaml index f1c86e694af1..9ca1a843c820 100644 --- a/Documentation/devicetree/bindings/spi/st,stm32-spi.yaml +++ b/Documentation/devicetree/bindings/spi/st,stm32-spi.yaml @@ -27,7 +27,6 @@ allOf: then: properties: st,spi-midi-ns: false - spi-slave: false properties: compatible: 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 |