diff options
| author |   Vinod Koul <vkoul@kernel.org> | 2022-04-06 18:52:38 +0530 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-04-06 15:50:08 +0100 |
| commit | 409543cec01a84610029d6440c480c3fdd7214fb (patch) | |
| tree | 5d768ff18ebe2856b74619c17420694938b3cdcf /drivers/spi/spi.c | |
| parent | spi: mxic: Fix an error handling path in mxic_spi_probe() (diff) | |
| download | linux-dev-409543cec01a84610029d6440c480c3fdd7214fb.tar.xz linux-dev-409543cec01a84610029d6440c480c3fdd7214fb.zip | |
spi: core: add dma_map_dev for __spi_unmap_msg()
Commit b470e10eb43f ("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: b470e10eb43f ("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>
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 c4dd1200fe99..32443ae175fd 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; |