patch-2.2.15 linux/drivers/char/pty.c

• Lines: 43
• Date: Fri Apr 21 12:53:17 2000
• Orig file: v2.2.14/drivers/char/pty.c
• Orig date: Sun Feb 7 01:28:37 1999

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/char/pty.c linux/drivers/char/pty.c
@@ -75,6 +75,7 @@
 			return;
 	}
 	wake_up_interruptible(&tty->read_wait);
+	wake_up_interruptible(&tty->poll_wait);
 	wake_up_interruptible(&tty->write_wait);
 	tty->packet = 0;
 	if (!tty->link)
@@ -82,6 +83,7 @@
 	tty->link->packet = 0;
 	wake_up_interruptible(&tty->link->read_wait);
 	wake_up_interruptible(&tty->link->write_wait);
+	wake_up_interruptible(&tty->link->poll_wait);
 	set_bit(TTY_OTHER_CLOSED, &tty->link->flags);
 	if (tty->driver.subtype == PTY_TYPE_MASTER) {
 		set_bit(TTY_OTHER_CLOSED, &tty->flags);
@@ -119,6 +121,7 @@
 	    o_tty->ldisc.write_wakeup)
 		(o_tty->ldisc.write_wakeup)(o_tty);
 	wake_up_interruptible(&o_tty->write_wait);
+	wake_up_interruptible(&o_tty->poll_wait);
 	set_bit(TTY_THROTTLED, &tty->flags);
 }
 
@@ -168,7 +171,9 @@
 		}
 		up(&tty->flip.pty_sem);
 	} else {
-		c = MIN(count, to->ldisc.receive_room(to));
+		c = to->ldisc.receive_room(to);
+		if (c > count)
+			c = count;
 		to->ldisc.receive_buf(to, buf, 0, c);
 	}
 	
@@ -294,6 +299,7 @@
 	if (to->packet) {
 		tty->ctrl_status |= TIOCPKT_FLUSHWRITE;
 		wake_up_interruptible(&to->read_wait);
+		wake_up_interruptible(&to->poll_wait);
 	}
 }