diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-07-04 17:35:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 17:35:07 +0100 |
| commit | 106dbe24d4146c0804cb025e450ac7af42d72356 (patch) | |
| tree | ad196f245894a8546603f8472619f9e5b73b8265 /drivers/spi/spi-stm32-qspi.c | |
| parent | Merge branch 'spi-5.2' into spi-linus (diff) | |
| parent | spi: pxa2xx: Add support for Intel Elkhart Lake (diff) | |
| download | linux-dev-106dbe24d4146c0804cb025e450ac7af42d72356.tar.xz linux-dev-106dbe24d4146c0804cb025e450ac7af42d72356.zip | |
Merge branch 'spi-5.3' into spi-next
Diffstat (limited to 'drivers/spi/spi-stm32-qspi.c')
| -rw-r--r-- | drivers/spi/spi-stm32-qspi.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 5dbb6a8e893c..655e4afbfb2a 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -245,12 +245,8 @@ static int stm32_qspi_tx_dma(struct stm32_qspi *qspi, writel_relaxed(cr | CR_DMAEN, qspi->io_base + QSPI_CR); t_out = sgt.nents * STM32_COMP_TIMEOUT_MS; - if (!wait_for_completion_interruptible_timeout(&qspi->dma_completion, - msecs_to_jiffies(t_out))) - err = -ETIMEDOUT; - - if (dma_async_is_tx_complete(dma_ch, cookie, - NULL, NULL) != DMA_COMPLETE) + if (!wait_for_completion_timeout(&qspi->dma_completion, + msecs_to_jiffies(t_out))) err = -ETIMEDOUT; if (err) @@ -304,7 +300,7 @@ static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi, cr = readl_relaxed(qspi->io_base + QSPI_CR); writel_relaxed(cr | CR_TCIE | CR_TEIE, qspi->io_base + QSPI_CR); - if (!wait_for_completion_interruptible_timeout(&qspi->data_completion, + if (!wait_for_completion_timeout(&qspi->data_completion, msecs_to_jiffies(STM32_COMP_TIMEOUT_MS))) { err = -ETIMEDOUT; } else { |