serial: imx: dma_unmap_sg buffers on shutdown

This properly unmaps DMA SG on device shutdown.

Reported-by: Nandor Han <nandor.han@ge.com>
Suggested-by: Nandor Han <nandor.han@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 42a5edd1e0f9e259080d75c228fc5b2b1046f420..80bed82e0e0e06852d0cc028dd6b8349ad464aff 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1425,10 +1425,18 @@ static void imx_uart_shutdown(struct uart_port *port)
        u32 ucr1, ucr2;
 
        if (sport->dma_is_enabled) {
-               sport->dma_is_rxing = 0;
-               sport->dma_is_txing = 0;
                dmaengine_terminate_sync(sport->dma_chan_tx);
+               if (sport->dma_is_txing) {
+                       dma_unmap_sg(sport->port.dev, &sport->tx_sgl[0],
+                                    sport->dma_tx_nents, DMA_TO_DEVICE);
+                       sport->dma_is_txing = 0;
+               }
                dmaengine_terminate_sync(sport->dma_chan_rx);
+               if (sport->dma_is_rxing) {
+                       dma_unmap_sg(sport->port.dev, &sport->rx_sgl,
+                                    1, DMA_FROM_DEVICE);
+                       sport->dma_is_rxing = 0;
+               }
 
                spin_lock_irqsave(&sport->port.lock, flags);
                imx_uart_stop_tx(port);