From 2da7f96243c25a2a90f1d1083abec28b83577c48 Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Sat, 25 Jun 2005 14:59:33 -0700 Subject: [PATCH] --- yaml --- r: 3427 b: refs/heads/master c: 6a72c7ba2e6df945484d7a85d7a82237270957fd h: refs/heads/master i: 3425: 1c6e003d7cba98a27110f1421b9f6c59565e94e1 3423: 76e95765d55f85ca23bc78dfde5d7968ab7ae16d v: v3 --- [refs] | 2 +- trunk/drivers/serial/68328serial.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a5c585711a8f..ffed9f1d6bab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d582b4ef6df853ca2da46135855cd6536c0205b +refs/heads/master: 6a72c7ba2e6df945484d7a85d7a82237270957fd diff --git a/trunk/drivers/serial/68328serial.c b/trunk/drivers/serial/68328serial.c index db92a0ceda79..feb8e73fc1c9 100644 --- a/trunk/drivers/serial/68328serial.c +++ b/trunk/drivers/serial/68328serial.c @@ -992,18 +992,17 @@ static int get_lsr_info(struct m68k_serial * info, unsigned int *value) /* * This routine sends a break character out the serial port. */ -static void send_break( struct m68k_serial * info, int duration) +static void send_break(struct m68k_serial * info, unsigned int duration) { m68328_uart *uart = &uart_addr[info->line]; unsigned long flags; if (!info->port) return; - set_current_state(TASK_INTERRUPTIBLE); save_flags(flags); cli(); #ifdef USE_INTS uart->utx.w |= UTX_SEND_BREAK; - schedule_timeout(duration); + msleep_interruptible(duration); uart->utx.w &= ~UTX_SEND_BREAK; #endif restore_flags(flags); @@ -1033,14 +1032,14 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, return retval; tty_wait_until_sent(tty, 0); if (!arg) - send_break(info, HZ/4); /* 1/4 second */ + send_break(info, 250); /* 1/4 second */ return 0; case TCSBRKP: /* support for POSIX tcsendbreak() */ retval = tty_check_change(tty); if (retval) return retval; tty_wait_until_sent(tty, 0); - send_break(info, arg ? arg*(HZ/10) : HZ/4); + send_break(info, arg ? arg*(100) : 250); return 0; case TIOCGSOFTCAR: error = put_user(C_CLOCAL(tty) ? 1 : 0,