lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] cpm_uart: use schedule_timeout instead of direct call to schedule

Browse Source 
use schedule_timeout instead of direct call to schedule

Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Kumar Gala
2005-09-03 15:55:37 -07:00
committed by Linus Torvalds
parent 0d8ba1a979
commit 638861d54e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/serial/cpm_uart/cpm_uart_core.c
View File

@@ -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) inline void cpm_uart_wait_until_send(struct uart_cpm_port *pinfo)
{ {
unsigned long target_jiffies = jiffies + pinfo->wait_closing; set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(pinfo->wait_closing);
while (!time_after(jiffies, target_jiffies))
schedule();
} }
/* /*
@@ -425,8 +423,11 @@ static void cpm_uart_shutdown(struct uart_port *port)
/* If the port is not the console, disable Rx and Tx. */ /* If the port is not the console, disable Rx and Tx. */
if (!(pinfo->flags & FLAG_CONSOLE)) { if (!(pinfo->flags & FLAG_CONSOLE)) {
/* Wait for all the BDs marked sent */ /* 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); schedule_timeout(2);
}
if (pinfo->wait_closing) if (pinfo->wait_closing)
cpm_uart_wait_until_send(pinfo); cpm_uart_wait_until_send(pinfo);