summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-stm32-qspi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/spi/spi-stm32-qspi.c')
-rw-r--r--drivers/spi/spi-stm32-qspi.c10
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,
245 writel_relaxed(cr | CR_DMAEN, qspi->io_base + QSPI_CR); 245 writel_relaxed(cr | CR_DMAEN, qspi->io_base + QSPI_CR);
246 246
247 t_out = sgt.nents * STM32_COMP_TIMEOUT_MS; 247 t_out = sgt.nents * STM32_COMP_TIMEOUT_MS;
248 if (!wait_for_completion_interruptible_timeout(&qspi->dma_completion, 248 if (!wait_for_completion_timeout(&qspi->dma_completion,
249 msecs_to_jiffies(t_out))) 249 msecs_to_jiffies(t_out)))
250 err = -ETIMEDOUT;
251
252 if (dma_async_is_tx_complete(dma_ch, cookie,
253 NULL, NULL) != DMA_COMPLETE)
254 err = -ETIMEDOUT; 250 err = -ETIMEDOUT;
255 251
256 if (err) 252 if (err)
@@ -304,7 +300,7 @@ static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi,
304 cr = readl_relaxed(qspi->io_base + QSPI_CR); 300 cr = readl_relaxed(qspi->io_base + QSPI_CR);
305 writel_relaxed(cr | CR_TCIE | CR_TEIE, qspi->io_base + QSPI_CR); 301 writel_relaxed(cr | CR_TCIE | CR_TEIE, qspi->io_base + QSPI_CR);
306 302
307 if (!wait_for_completion_interruptible_timeout(&qspi->data_completion, 303 if (!wait_for_completion_timeout(&qspi->data_completion,
308 msecs_to_jiffies(STM32_COMP_TIMEOUT_MS))) { 304 msecs_to_jiffies(STM32_COMP_TIMEOUT_MS))) {
309 err = -ETIMEDOUT; 305 err = -ETIMEDOUT;
310 } else { 306 } else {