diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-04 23:19:10 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-04 23:19:10 -0400 |
| commit | e1a7d1673062a6a9160b1fc94e1540b747398e01 (patch) | |
| tree | 77ed1ca15537d1ae04a6ab0ff6128567c0fa497e /drivers/spi/spi-pic32.c | |
| parent | 9fda6693335cd51b0a74cffaac266c83439f7efe (diff) | |
| parent | a026525d4e45e3d9690bffd0b05d018ff5638b5a (diff) | |
Merge branch 'spi-5.1' into spi-5.2
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, | |||
| 559 | dev_err(&spi->dev, "wait error/timedout\n"); | 559 | dev_err(&spi->dev, "wait error/timedout\n"); |
| 560 | if (dma_issued) { | 560 | if (dma_issued) { |
| 561 | dmaengine_terminate_all(master->dma_rx); | 561 | dmaengine_terminate_all(master->dma_rx); |
| 562 | dmaengine_terminate_all(master->dma_rx); | 562 | dmaengine_terminate_all(master->dma_tx); |
| 563 | } | 563 | } |
| 564 | ret = -ETIMEDOUT; | 564 | ret = -ETIMEDOUT; |
| 565 | } else { | 565 | } else { |