X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Ftc%2Fzs.c;h=3d72aa5cfc713bb3b66dbe3c6b49ee8ceb25d0df;hb=4559b438225b01942e1661759db0df55883b1bc0;hp=792becdfe6f844737b06ccc6dca776b4934b3e4c;hpb=24fcbacedb0d83cabc6761acbecfbf751265ce52;p=linux-2.6

diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index 792becdfe6..3d72aa5cfc 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -626,10 +626,8 @@ static void do_softint(unsigned long private_)
 	if (!tty)
 		return;
 
-	if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
+	if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event))
 		tty_wakeup(tty);
-		wake_up_interruptible(&tty->write_wait);
-	}
 }
 
 static int zs_startup(struct dec_serial * info)
@@ -1238,7 +1236,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
 	return 0;
 }
 
-static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios)
+static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
 	struct dec_serial *info = (struct dec_serial *)tty->driver_data;
 	int was_stopped;