---

yaml --- r: 304189 b: refs/heads/master c: ef4f9d4 h: refs/heads/master i: 304187: a46085b v: v3
git-mirror · Apr 9, 2012 · 2f99b9e · 2f99b9e
1 parent cd36371
commit 2f99b9e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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;
 }