From 5f3cbb049933955ee552ad373ae9eef72c61322c Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Fri, 14 Mar 2008 14:54:13 +0100
Subject: [PATCH] --- yaml --- r: 99247 b: refs/heads/master c:
 e1c609efbc0333840f2af2d875ca52ed8ee18587 h: refs/heads/master i:   99245:
 8dbbc52d1e593fddaaa2a252562eb978c1e1c00c   99243:
 58e0d0481907eaf02daf84b746cebe567d275b0b   99239:
 7e9d9b57976770963c1d5e387cd5c4c8d4ef3956   99231:
 9f0921a2d110ff8a91c90b9bd1cf774e19501059 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/serial/atmel_serial.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index db5d4e0c4aaf..5c41a0833954 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f826caa44902ddbe93174f0b642d8abf9698c08e
+refs/heads/master: e1c609efbc0333840f2af2d875ca52ed8ee18587
diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c
index 5f0414fc1b10..6aeef22bd203 100644
--- a/trunk/drivers/serial/atmel_serial.c
+++ b/trunk/drivers/serial/atmel_serial.c
@@ -1454,6 +1454,12 @@ static int atmel_serial_suspend(struct platform_device *pdev,
 	struct uart_port *port = platform_get_drvdata(pdev);
 	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
 
+	if (atmel_is_console_port(port) && console_suspend_enabled) {
+		/* Drain the TX shifter */
+		while (!(UART_GET_CSR(port) & ATMEL_US_TXEMPTY))
+			cpu_relax();
+	}
+
 	if (device_may_wakeup(&pdev->dev)
 	    && !atmel_serial_clk_will_stop())
 		enable_irq_wake(port->irq);