aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-04 11:41:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-04 11:41:41 -0700
commit3c06e6cbdb6a3faa73fbdfd9022e23f82d24c372 (patch)
tree32bb0fdf684d5c1d48e980c1af58a55f80e7ef7e
parente00811b4ca520e5a876baf41c6831de4bc276d3e (diff)
parentfc098af16b9ff6d470d779d8ddcfb2d91869045a (diff)
downloadleg-kernel-3c06e6cbdb6a3faa73fbdfd9022e23f82d24c372.tar.gz
Merge tag 'tty-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty fix from Greg KH: "Here is a single tty core fix for 4.12-rc4. It reverts a patch that a lot of people reported as causing lockdep and other warnings. Right after I reverted this in my tree, it seems like another "correct" fix might have shown up, but it's too late in the release cycle to be messing with tty core locking, so let's just revert this for now to go back how things always have been and try it again for 4.13. This has not been in linux-next as I only reverted it a few hours ago" * tag 'tty-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "tty: fix port buffer locking"
-rw-r--r--drivers/tty/tty_port.c2
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);