leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] serial/68360serial: replace schedule_timeout() with msleep_interruptible()

Browse Source 
Use msleep_interruptible() instead of schedule_timeout() in send_break() to
guarantee the task delays as expected.  Change @duration's units to
milliseconds, and modify arguments in callers appropriately.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Nishanth Aravamudan 2005-06-25 14:59:32 -07:00 committed by Linus Torvalds
parent f353488ce4
commit 5d582b4ef6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/serial/68360serial.c
View File

@ -1394,14 +1394,13 @@ static void end_break(ser_info_t *info)
/* /*
* This routine sends a break character out the serial port. * This routine sends a break character out the serial port.
*/ */
static void send_break(ser_info_t *info, int duration) static void send_break(ser_info_t *info, unsigned int duration)
{ {
set_current_state(TASK_INTERRUPTIBLE);
#ifdef SERIAL_DEBUG_SEND_BREAK #ifdef SERIAL_DEBUG_SEND_BREAK
printk("rs_send_break(%d) jiff=%lu...", duration, jiffies); printk("rs_send_break(%d) jiff=%lu...", duration, jiffies);
#endif #endif
begin_break(info); begin_break(info);
schedule_timeout(duration); msleep_interruptible(duration);
end_break(info); end_break(info);
#ifdef SERIAL_DEBUG_SEND_BREAK #ifdef SERIAL_DEBUG_SEND_BREAK
printk("done jiffies=%lu\n", jiffies); printk("done jiffies=%lu\n", jiffies);
@ -1436,7 +1435,7 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
if (signal_pending(current)) if (signal_pending(current))
return -EINTR; return -EINTR;
if (!arg) { if (!arg) {
send_break(info, HZ/4); /* 1/4 second */ send_break(info, 250); /* 1/4 second */
if (signal_pending(current)) if (signal_pending(current))
return -EINTR; return -EINTR;
} }
@ -1448,7 +1447,7 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
tty_wait_until_sent(tty, 0); tty_wait_until_sent(tty, 0);
if (signal_pending(current)) if (signal_pending(current))
return -EINTR; return -EINTR;
send_break(info, arg ? arg*(HZ/10) : HZ/4); send_break(info, arg ? arg*100 : 250);
if (signal_pending(current)) if (signal_pending(current))
return -EINTR; return -EINTR;
return 0; return 0;