patch-2.2.19 linux/drivers/sbus/char/zs.c

• Lines: 32
• Date: Sun Mar 25 11:37:35 2001
• Orig file: v2.2.18/drivers/sbus/char/zs.c
• Orig date: Sun Mar 25 11:13:08 2001

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/drivers/sbus/char/zs.c linux/drivers/sbus/char/zs.c
@@ -1,4 +1,4 @@
-/* $Id: zs.c,v 1.41.2.6 2000/04/17 05:46:05 davem Exp $
+/* $Id: zs.c,v 1.41.2.7 2001/01/03 08:07:04 ecd Exp $
  * zs.c: Zilog serial port driver for the Sparc.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -904,7 +904,6 @@
  */
 static void change_speed(struct sun_serial *info)
 {
-	unsigned short port;
 	unsigned cflag;
 	int	quot = 0;
 	int	i;
@@ -913,7 +912,7 @@
 	if (!info->tty || !info->tty->termios)
 		return;
 	cflag = info->tty->termios->c_cflag;
-	if (!(port = info->port))
+	if (!info->port)
 		return;
 	i = cflag & CBAUD;
 	if (cflag & CBAUDEX) {
@@ -1857,7 +1856,7 @@
 
 static void show_serial_version(void)
 {
-	char *revision = "$Revision: 1.41.2.6 $";
+	char *revision = "$Revision: 1.41.2.7 $";
 	char *version, *p;
 
 	version = strchr(revision, ' ');