diff options
| author | Mark Brown <broonie@kernel.org> | 2019-05-02 11:20:26 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-02 11:20:26 +0900 |
| commit | 58b860ed4a77d9cb17b78e663a0341b79a12e240 (patch) | |
| tree | a82d81a9075394e7dc8b46fe2732270e24390a7a /drivers/spi/spi-pic32.c | |
| parent | 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b (diff) | |
| parent | 7e95b16625a3659a75c0ba4d5b0802324d16be13 (diff) | |
Merge branch 'spi-5.1' into spi-linus
Diffstat (limited to 'drivers/spi/spi-pic32.c')
| -rw-r--r-- | drivers/spi/spi-pic32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c index 131849adc570..d9f374c8b709 100644 --- a/drivers/spi/spi-pic32.c +++ b/drivers/spi/spi-pic32.c @@ -559,7 +559,7 @@ static int pic32_spi_one_transfer(struct spi_master *master, dev_err(&spi->dev, "wait error/timedout\n"); if (dma_issued) { dmaengine_terminate_all(master->dma_rx); - dmaengine_terminate_all(master->dma_rx); + dmaengine_terminate_all(master->dma_tx); } ret = -ETIMEDOUT; } else { |