diff options
author | Mark Brown <broonie@kernel.org> | 2020-10-09 18:01:22 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-10-09 18:01:22 +0300 |
commit | 988731181359efd771ae967f94936906fa38868a (patch) | |
tree | 49b5aee659fe3686d1f40374ecd36136d0d2f836 /drivers/spi/spi-cadence-quadspi.c | |
parent | d4f3a651ab82685c63e6fb38bec20b3ccf08c085 (diff) | |
parent | 855a40cd8cccfbf5597adfa77f55cdc8c44b6e42 (diff) |
Merge remote-tracking branch 'spi/for-5.10' into spi-next
Diffstat (limited to 'drivers/spi/spi-cadence-quadspi.c')
-rw-r--r-- | drivers/spi/spi-cadence-quadspi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index c6795c684b16..40938cf3806d 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1119,11 +1119,8 @@ static int cqspi_request_mmap_dma(struct cqspi_st *cqspi) cqspi->rx_chan = dma_request_chan_by_mask(&mask); if (IS_ERR(cqspi->rx_chan)) { int ret = PTR_ERR(cqspi->rx_chan); - - if (ret != -EPROBE_DEFER) - dev_err(&cqspi->pdev->dev, "No Rx DMA available\n"); cqspi->rx_chan = NULL; - return ret; + return dev_err_probe(&cqspi->pdev->dev, ret, "No Rx DMA available\n"); } init_completion(&cqspi->rx_dma_complete); |