diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-07-14 16:31:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 21:58:12 +0200 |
| commit | 6d31a88cb2e01d46c0cb74aa5da529e1f92ae3db (patch) | |
| tree | 09ce3b070a845395f942b0ddeb8149514c0a7446 /drivers/tty/synclink_gt.c | |
| parent | Merge branch 'v3.6-rc7' into tty-next (diff) | |
| download | linux-6d31a88cb2e01d46c0cb74aa5da529e1f92ae3db.tar.xz 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 'drivers/tty/synclink_gt.c')
| -rw-r--r-- | drivers/tty/synclink_gt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c index 45b43f11ca39..aa1debf97cc7 100644 --- a/drivers/tty/synclink_gt.c +++ b/drivers/tty/synclink_gt.c @@ -3336,9 +3336,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, } DBGINFO(("%s block_til_ready wait\n", tty->driver->name)); - tty_unlock(tty); + tty_unlock(); schedule(); - tty_lock(tty); + tty_lock(); } set_current_state(TASK_RUNNING); |