diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-04-13 18:33:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-13 18:33:28 +0100 |
| commit | e7cc4244bc2086f4074b8e4d4f78e7b9f5007224 (patch) | |
| tree | 361f54f9060c44f5fe97cdfafebf96a80ce6b08e /drivers/spi/spi.c | |
| parent | spi: spi-rspi: Remove setting {src,dst}_{addr,addr_width} based on DMA direction (diff) | |
| parent | spi: atmel-quadspi: Remove duplicated DTR checks (diff) | |
| download | linux-dev-e7cc4244bc2086f4074b8e4d4f78e7b9f5007224.tar.xz linux-dev-e7cc4244bc2086f4074b8e4d4f78e7b9f5007224.zip | |
spi: Pull in Atmel fix
Pull in Atmel fix series, only first patch of which is for Linus
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 3d4dddd1b456..1da196bfcee4 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1130,11 +1130,15 @@ static int __spi_unmap_msg(struct spi_controller *ctlr, struct spi_message *msg) if (ctlr->dma_tx) tx_dev = ctlr->dma_tx->device->dev; + else if (ctlr->dma_map_dev) + tx_dev = ctlr->dma_map_dev; else tx_dev = ctlr->dev.parent; if (ctlr->dma_rx) rx_dev = ctlr->dma_rx->device->dev; + else if (ctlr->dma_map_dev) + rx_dev = ctlr->dma_map_dev; else rx_dev = ctlr->dev.parent; |