From 2f99b9e8ceb278285b3fa1de7e8f01c689b4ee48 Mon Sep 17 00:00:00 2001 From: Tomoya MORINAGA Date: Mon, 26 Mar 2012 14:43:06 +0900 Subject: [PATCH] --- yaml --- r: 304189 b: refs/heads/master c: ef4f9d4f09265b60fcb6bfa31a614ea84a72b7a8 h: refs/heads/master i: 304187: a46085b93345d17db2873a26bfccda896cde8264 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/pch_uart.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1fd371bec11a..2d1791fddc02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04e2c2e3bfb1652510d4c12ac2837a8f8b08bd3a +refs/heads/master: ef4f9d4f09265b60fcb6bfa31a614ea84a72b7a8 diff --git a/trunk/drivers/tty/serial/pch_uart.c b/trunk/drivers/tty/serial/pch_uart.c index e7d91d973d52..6e96304b7c8f 100644 --- a/trunk/drivers/tty/serial/pch_uart.c +++ b/trunk/drivers/tty/serial/pch_uart.c @@ -656,10 +656,13 @@ static void pch_free_dma(struct uart_port *port) dma_release_channel(priv->chan_rx); priv->chan_rx = NULL; } - if (sg_dma_address(&priv->sg_rx)) - dma_free_coherent(port->dev, port->fifosize, - sg_virt(&priv->sg_rx), - sg_dma_address(&priv->sg_rx)); + + if (priv->rx_buf_dma) { + dma_free_coherent(port->dev, port->fifosize, priv->rx_buf_virt, + priv->rx_buf_dma); + priv->rx_buf_virt = NULL; + priv->rx_buf_dma = 0; + } return; }