From 95bb92c2a63e5888c4ca6844d3ba05a485dbc0c1 Mon Sep 17 00:00:00 2001
From: Stanislav Kozina <skozina@redhat.com>
Date: Thu, 16 Aug 2012 12:01:47 +0100
Subject: [PATCH] --- yaml --- r: 325679 b: refs/heads/master c:
 e9490e93c1978b6669f3e993caa3189be13ce459 h: refs/heads/master i:   325677:
 4d1a90f9667b6ec9d702a0a981a51836d166e8b3   325675:
 be6f2164d33fb72537f6b7cbe7c5a9e94029cef6   325671:
 11b3968bda2fb03499b9ba93c8e1bc2b1bb0c074   325663:
 630ec70adbfd83b56aa71752419c9ecc0b0d7026 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/tty/n_tty.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b53103ab97c2..bdbcea341933 100644
--- 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
index 6259242b7858..8c0b7b42319c 100644
--- 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)