diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-08-08 16:30:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-10 12:55:47 -0700 |
| commit | 89c8d91e31f267703e365593f6bfebb9f6d2ad01 (patch) | |
| tree | b115c7738762abe4a8a6374debb4991382b2f785 /drivers/tty/cyclades.c | |
| parent | dc6802a771e91050fb686dfeeb9de4c6c9cadb79 (diff) | |
| download | linux-stable-89c8d91e31f267703e365593f6bfebb9f6d2ad01.tar.gz linux-stable-89c8d91e31f267703e365593f6bfebb9f6d2ad01.tar.bz2 linux-stable-89c8d91e31f267703e365593f6bfebb9f6d2ad01.zip | |
tty: localise the lock
The termios and other changes mean the other protections needed on the driver
tty arrays should be adequate. Turn it all back on.
This contains pieces folded in from the fixes made to the original patches
| From: Geert Uytterhoeven <geert@linux-m68k.org> (fix m68k)
| From: Paul Gortmaker <paul.gortmaker@windriver.com> (fix cris)
| From: Jiri Kosina <jkosina@suze.cz> (lockdep)
| From: Eric Dumazet <eric.dumazet@gmail.com> (lockdep)
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 e77db714ab26..c8850ea832af 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(info->port.close_wait, + wait_event_interruptible_tty(tty, info->port.close_wait, !(info->port.flags & ASYNC_CLOSING)); return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS; } |