diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 09:27:05 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 09:27:05 +0200 |
commit | 8bc39bca5e3e8da0d62f7f4d67fdbeecab02b350 (patch) | |
tree | ac5df85133c64167381acb33086e154724148dc2 /drivers/tty | |
parent | 094094a9373fbea80ec00714eed5c24f6fd39ecf (diff) | |
parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
download | linux-8bc39bca5e3e8da0d62f7f4d67fdbeecab02b350.tar.bz2 |
Merge 4.12-rc4 into tty-next
We want the tty locking fix in here, so that maybe we can finally get it
fixed for real...
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/tty_port.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index 4fb3165384c4..6b137194069f 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c @@ -34,9 +34,7 @@ static int tty_port_default_receive_buf(struct tty_port *port, if (!disc) return 0; - mutex_lock(&tty->atomic_write_lock); ret = tty_ldisc_receive_buf(disc, p, (char *)f, count); - mutex_unlock(&tty->atomic_write_lock); tty_ldisc_deref(disc); |