patch-2.1.37 linux/drivers/sbus/char/sunserial.c

• Lines: 37
• Date: Mon May 12 17:39:50 1997
• Orig file: v2.1.36/linux/drivers/sbus/char/sunserial.c
• Orig date: Wed Apr 23 19:01:21 1997

diff -u --recursive --new-file v2.1.36/linux/drivers/sbus/char/sunserial.c linux/drivers/sbus/char/sunserial.c
@@ -1,4 +1,4 @@
-/* $Id: sunserial.c,v 1.38 1997/04/14 17:05:00 jj Exp $
+/* $Id: sunserial.c,v 1.39 1997/04/23 07:45:26 ecd Exp $
  * serial.c: Serial port driver for the Sparc.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -687,7 +687,7 @@
 	if (!tty)
 		return;
 
-	if (clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
+	if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
 		if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
 		    tty->ldisc.write_wakeup)
 			(tty->ldisc.write_wakeup)(tty);
@@ -866,10 +866,10 @@
 	i = cflag & CBAUD;
 	if (cflag & CBAUDEX) {
 		i &= ~CBAUDEX;
-		if (i != 1)
+		if (i != 5)
 			info->tty->termios->c_cflag &= ~CBAUDEX;
 		else
-			i += 15;
+			i = 16;
 	}
 	if (i == 15) {
 		if ((info->flags & ZILOG_SPD_MASK) == ZILOG_SPD_HI)
@@ -1857,7 +1857,7 @@
 
 static void show_serial_version(void)
 {
-	char *revision = "$Revision: 1.38 $";
+	char *revision = "$Revision: 1.39 $";
 	char *version, *p;
 
 	version = strchr(revision, ' ');