Skip to content

Commit 409543c

Browse files
vinodkoulbroonie
authored andcommitted
spi: core: add dma_map_dev for __spi_unmap_msg()
Commit b470e10 ("spi: core: add dma_map_dev for dma device") added dma_map_dev for _spi_map_msg() but missed to add for unmap routine, __spi_unmap_msg(), so add it now. Fixes: b470e10 ("spi: core: add dma_map_dev for dma device") Cc: stable@vger.kernel.org # v5.14+ Signed-off-by: Vinod Koul <vkoul@kernel.org> Link: https://lore.kernel.org/r/20220406132238.1029249-1-vkoul@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 35d516b commit 409543c

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/spi/spi.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,11 +1130,15 @@ static int __spi_unmap_msg(struct spi_controller *ctlr, struct spi_message *msg)
11301130

11311131
if (ctlr->dma_tx)
11321132
tx_dev = ctlr->dma_tx->device->dev;
1133+
else if (ctlr->dma_map_dev)
1134+
tx_dev = ctlr->dma_map_dev;
11331135
else
11341136
tx_dev = ctlr->dev.parent;
11351137

11361138
if (ctlr->dma_rx)
11371139
rx_dev = ctlr->dma_rx->device->dev;
1140+
else if (ctlr->dma_map_dev)
1141+
rx_dev = ctlr->dma_map_dev;
11381142
else
11391143
rx_dev = ctlr->dev.parent;
11401144

0 commit comments

Comments
 (0)