Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 638861d5 authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds
Browse files

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



use schedule_timeout instead of direct call to schedule

Signed-off-by: default avatarMarcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0d8ba1a9

drivers/serial/cpm_uart/cpm_uart_core.c

+7 −6
Original line number Diff line number Diff line
@@ -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,8 +423,11 @@ 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)

			cpm_uart_wait_until_send(pinfo);