patch-2.2.7 linux/drivers/char/n_tty.c

• Lines: 17
• Date: Sat Apr 24 17:49:37 1999
• Orig file: v2.2.6/linux/drivers/char/n_tty.c
• Orig date: Tue Jan 19 11:32:51 1999

diff -u --recursive --new-file v2.2.6/linux/drivers/char/n_tty.c linux/drivers/char/n_tty.c
@@ -922,8 +922,14 @@
 		}
 	}
 
-	if (down_interruptible(&tty->atomic_read))
-		return -ERESTARTSYS;
+	if (file->f_flags & O_NONBLOCK) {
+		if (down_trylock(&tty->atomic_read))
+			return -EAGAIN;
+	}
+	else {
+		if (down_interruptible(&tty->atomic_read))
+			return -ERESTARTSYS;
+	}
 
 	add_wait_queue(&tty->read_wait, &wait);
 	set_bit(TTY_DONT_FLIP, &tty->flags);