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 /drivers/tty/cyclades.c | |
| parent | 467a3ca5cab64a16b5ec46ebb1895c84c280dcfe (diff) | |
| download | linux-3.10-6d31a88cb2e01d46c0cb74aa5da529e1f92ae3db.tar.gz linux-3.10-6d31a88cb2e01d46c0cb74aa5da529e1f92ae3db.tar.bz2 linux-3.10-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/cyclades.c')
| -rw-r--r-- | drivers/tty/cyclades.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c index 69e9ca2dd4b..cff546839db 100644 --- a/drivers/tty/cyclades.c +++ b/drivers/tty/cyclades.c @@ -1599,7 +1599,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp) * If the port is the middle of closing, bail out now */ if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) { - wait_event_interruptible_tty(tty, info->port.close_wait, + wait_event_interruptible_tty(info->port.close_wait, !(info->port.flags & ASYNC_CLOSING)); return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS; } |