| From 409543cec01a84610029d6440c480c3fdd7214fb Mon Sep 17 00:00:00 2001 |
| From: Vinod Koul <vkoul@kernel.org> |
| Date: Wed, 6 Apr 2022 18:52:38 +0530 |
| Subject: spi: core: add dma_map_dev for __spi_unmap_msg() |
| |
| From: Vinod Koul <vkoul@kernel.org> |
| |
| commit 409543cec01a84610029d6440c480c3fdd7214fb upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/spi/spi.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/spi/spi.c |
| +++ b/drivers/spi/spi.c |
| @@ -1151,11 +1151,15 @@ static int __spi_unmap_msg(struct spi_co |
| |
| 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; |
| |
