projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
n_hdlc.c
diff --git
a/drivers/tty/n_hdlc.c
b/drivers/tty/n_hdlc.c
index bbc4ce66c2c18dd30fb10b80f955a4f4565225c5..644ddb841d9f54085bb82a903034af5aaf42de45 100644
(file)
--- a/
drivers/tty/n_hdlc.c
+++ b/
drivers/tty/n_hdlc.c
@@
-600,7
+600,7
@@
static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
add_wait_queue(&tty->read_wait, &wait);
for (;;) {
add_wait_queue(&tty->read_wait, &wait);
for (;;) {
- if (test_bit(TTY_OTHER_
DONE
, &tty->flags)) {
+ if (test_bit(TTY_OTHER_
CLOSED
, &tty->flags)) {
ret = -EIO;
break;
}
ret = -EIO;
break;
}
@@
-828,7
+828,7
@@
static unsigned int n_hdlc_tty_poll(struct tty_struct *tty, struct file *filp,
/* set bits for operations that won't block */
if (n_hdlc->rx_buf_list.head)
mask |= POLLIN | POLLRDNORM; /* readable */
/* set bits for operations that won't block */
if (n_hdlc->rx_buf_list.head)
mask |= POLLIN | POLLRDNORM; /* readable */
- if (test_bit(TTY_OTHER_
DONE
, &tty->flags))
+ if (test_bit(TTY_OTHER_
CLOSED
, &tty->flags))
mask |= POLLHUP;
if (tty_hung_up_p(filp))
mask |= POLLHUP;
mask |= POLLHUP;
if (tty_hung_up_p(filp))
mask |= POLLHUP;