commit 25e8d0ed75a6b3e7c2f533f0460a48f903d94269
author Peter Hurley <peter@hurleysoftware.com> Tue Feb 11 18:55:30 2014 -0500
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thu Feb 13 10:18:48 2014 -0800
tree 6d3d05d765375eba4432037e1f453d435a622b4d
parent 5669b705024659e982472cef22f7fc3c3a09cba2

n_tty: Simplify input_available_p()

Greg,

Please note this patch requires
   n_tty: Fix poll() when TIME_CHAR and MIN_CHAR == 0

Regards,
Peter Hurley

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/tty/n_tty.c

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index d15624c..41fe8a0 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1900,13 +1900,10 @@
 	struct n_tty_data *ldata = tty->disc_data;
 	int amt = poll && !TIME_CHAR(tty) && MIN_CHAR(tty) ? MIN_CHAR(tty) : 1;
 
-	if (ldata->icanon && !L_EXTPROC(tty)) {
-		if (ldata->canon_head != ldata->read_tail)
-			return 1;
-	} else if (read_cnt(ldata) >= amt)
-		return 1;
-
-	return 0;
+	if (ldata->icanon && !L_EXTPROC(tty))
+		return ldata->canon_head != ldata->read_tail;
+	else
+		return read_cnt(ldata) >= amt;
 }
 
 /**