diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-07-14 15:31:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 12:58:12 -0700 |
| commit | 6d31a88cb2e01d46c0cb74aa5da529e1f92ae3db (patch) | |
| tree | 09ce3b070a845395f942b0ddeb8149514c0a7446 /net/bluetooth/rfcomm/tty.c | |
| parent | 467a3ca5cab64a16b5ec46ebb1895c84c280dcfe (diff) | |
| download | blackbird-op-linux-6d31a88cb2e01d46c0cb74aa5da529e1f92ae3db.tar.gz blackbird-op-linux-6d31a88cb2e01d46c0cb74aa5da529e1f92ae3db.zip | |
tty: revert incorrectly applied lock patch
I sent GregKH this after the pre-requisites. He dropped the pre-requesites
for good reason and unfortunately then applied this patch. Without this
reverted you get random kernel memory corruption which will make bisecting
anything between it and the properly applied patches a complete sod.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/bluetooth/rfcomm/tty.c')
| -rw-r--r-- | net/bluetooth/rfcomm/tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index aa5d73b786ac..d1820ff14aee 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c @@ -710,9 +710,9 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp) break; } - tty_unlock(tty); + tty_unlock(); schedule(); - tty_lock(tty); + tty_lock(); } set_current_state(TASK_RUNNING); remove_wait_queue(&dev->wait, &wait); |
