---

yaml
---
r: 6911
b: refs/heads/master
c: 638861d
h: refs/heads/master
i:
  6909: 5304f78
  6907: 276cc4b
  6903: 4932060
  6895: 6412661
  6879: 398a05b
  6847: 079764d
  6783: 9ffc87e
  6655: 62d18c7
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d8ba1a9793302fdcee3d6d4133c455023ca8ce9
+refs/heads/master: 638861d54eec6b04a88d5d8df8b790d87de80b8d

trunk/drivers/serial/cpm_uart/cpm_uart_core.c

@@ -403,10 +403,8 @@ static int cpm_uart_startup(struct uart_port *port)
 
 inline void cpm_uart_wait_until_send(struct uart_cpm_port *pinfo)
 {
-	unsigned long target_jiffies = jiffies + pinfo->wait_closing;
-
-	while (!time_after(jiffies, target_jiffies))
-   		schedule();
+	set_current_state(TASK_UNINTERRUPTIBLE);
+	schedule_timeout(pinfo->wait_closing);
 }
 
 /*
@@ -425,9 +423,12 @@ static void cpm_uart_shutdown(struct uart_port *port)
 	/* If the port is not the console, disable Rx and Tx. */
 	if (!(pinfo->flags & FLAG_CONSOLE)) {
 		/* Wait for all the BDs marked sent */
-		while(!cpm_uart_tx_empty(port))
+		while(!cpm_uart_tx_empty(port)) {
+			set_current_state(TASK_UNINTERRUPTIBLE);
 			schedule_timeout(2);
-		if(pinfo->wait_closing)
+		}
+
+		if (pinfo->wait_closing)
 			cpm_uart_wait_until_send(pinfo);
 
 		/* Stop uarts */