OSDN Git Service

spi: stm32-qspi: remove signal sensitive on completion
authorLudovic Barre <ludovic.barre@st.com>
Thu, 27 Jun 2019 07:43:59 +0000 (09:43 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 28 Jun 2019 14:25:40 +0000 (15:25 +0100)
On umount step a sigkill signal is set (without user specific
action), due to sigkill signal the completion will be interrupted and
the data transfer can't be finished if a sync is needed.

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-stm32-qspi.c

index 42f8e3c..0b07182 100644 (file)
@@ -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 {