---

yaml --- r: 325679 b: refs/heads/master c: e9490e9 h: refs/heads/master i: 325677: 4d1a90f 325675: be6f216 325671: 11b3968 325663: 630ec70 v: v3
git-mirror · Aug 16, 2012 · 95bb92c · 95bb92c
1 parent d6a5792
commit 95bb92c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6683549e4ba050cddd8fa88c3f1e53b825fdcb6d
+refs/heads/master: e9490e93c1978b6669f3e993caa3189be13ce459
diff --git a/trunk/drivers/tty/n_tty.c b/trunk/drivers/tty/n_tty.c
@@ -1742,7 +1742,8 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
 
 do_it_again:
 
-	BUG_ON(!tty->read_buf);
+	if (WARN_ON(!tty->read_buf))
+		return -EAGAIN;
 
 	c = job_control(tty, file);
 	if (c < 0)