Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3426
b: refs/heads/master
c: 5d582b4
h: refs/heads/master
v: v3
  • Loading branch information
Nishanth Aravamudan authored and Linus Torvalds committed Jun 25, 2005
1 parent 1c6e003 commit e4f3e87
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f353488ce48e7a0311fe764284096481b455fbe9
refs/heads/master: 5d582b4ef6df853ca2da46135855cd6536c0205b
9 changes: 4 additions & 5 deletions trunk/drivers/serial/68360serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -1394,14 +1394,13 @@ static void end_break(ser_info_t *info)
/*
* 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
printk("rs_send_break(%d) jiff=%lu...", duration, jiffies);
#endif
begin_break(info);
schedule_timeout(duration);
msleep_interruptible(duration);
end_break(info);
#ifdef SERIAL_DEBUG_SEND_BREAK
printk("done jiffies=%lu\n", jiffies);
Expand Down Expand Up @@ -1436,7 +1435,7 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
if (signal_pending(current))
return -EINTR;
if (!arg) {
send_break(info, HZ/4); /* 1/4 second */
send_break(info, 250); /* 1/4 second */
if (signal_pending(current))
return -EINTR;
}
Expand All @@ -1448,7 +1447,7 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
tty_wait_until_sent(tty, 0);
if (signal_pending(current))
return -EINTR;
send_break(info, arg ? arg*(HZ/10) : HZ/4);
send_break(info, arg ? arg*100 : 250);
if (signal_pending(current))
return -EINTR;
return 0;
Expand Down

0 comments on commit e4f3e87

Please sign in to comment.