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 remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
n_tty.c
diff --git
a/drivers/tty/n_tty.c
b/drivers/tty/n_tty.c
index 6c7fe90ad72d48d2834536331e6826ee2719f94f..6cfe4019abc63b3f3321df606e57bdd38ed6be72 100644
(file)
--- a/
drivers/tty/n_tty.c
+++ b/
drivers/tty/n_tty.c
@@
-2066,8
+2066,12
@@
static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
if (tty->ops->flush_chars)
tty->ops->flush_chars(tty);
} else {
if (tty->ops->flush_chars)
tty->ops->flush_chars(tty);
} else {
+ struct n_tty_data *ldata = tty->disc_data;
+
while (nr > 0) {
while (nr > 0) {
+ mutex_lock(&ldata->output_lock);
c = tty->ops->write(tty, b, nr);
c = tty->ops->write(tty, b, nr);
+ mutex_unlock(&ldata->output_lock);
if (c < 0) {
retval = c;
goto break_out;
if (c < 0) {
retval = c;
goto break_out;