summaryrefslogtreecommitdiffstats
path: root/drivers/tty/n_tty.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-02-11 18:55:30 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-13 10:18:48 -0800
commit25e8d0ed75a6b3e7c2f533f0460a48f903d94269 (patch)
tree6d3d05d765375eba4432037e1f453d435a622b4d /drivers/tty/n_tty.c
parent5669b705024659e982472cef22f7fc3c3a09cba2 (diff)
downloadop-kernel-dev-25e8d0ed75a6b3e7c2f533f0460a48f903d94269.zip
op-kernel-dev-25e8d0ed75a6b3e7c2f533f0460a48f903d94269.tar.gz
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>
Diffstat (limited to 'drivers/tty/n_tty.c')
-rw-r--r--drivers/tty/n_tty.c11
1 files changed, 4 insertions, 7 deletions
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 @@ static inline int input_available_p(struct tty_struct *tty, int poll)
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;
}
/**
OpenPOWER on IntegriCloud