1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index bc64700b514d..b1ee1f521ba0 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -714,7 +714,7 @@ static int dspi_transfer_one_message(struct spi_master *master,
                                 SPI_RSER_TFFFE | SPI_RSER_TFFFD |
                                 SPI_RSER_RFDFE | SPI_RSER_RFDFD);
                         status = dspi_dma_xfer(dspi);
-                        goto out;
+                        break;
                 default:
                         dev_err(&dspi->pdev->dev, "unsupported trans_mode %u\n",
                                 trans_mode);
@@ -722,9 +722,13 @@ static int dspi_transfer_one_message(struct spi_master *master,
                         goto out;
                 }
 
-                if (wait_event_interruptible(dspi->waitq, dspi->waitflags))
-                        dev_err(&dspi->pdev->dev, "wait transfer complete fail!\n");
-                dspi->waitflags = 0;
+                if (trans_mode != DSPI_DMA_MODE) {
+                        if (wait_event_interruptible(dspi->waitq,
+                                                dspi->waitflags))
+                                dev_err(&dspi->pdev->dev,
+                                        "wait transfer complete fail!\n");
+                        dspi->waitflags = 0;
+                }
 
                 if (transfer->delay_usecs)
                         udelay(transfer->delay_usecs);