diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 12:03:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 12:03:43 -0700 |
| commit | 15bdb5652689d51cc0316de61774d2732472d9e1 (patch) | |
| tree | fb79ca4d6bf8d46c466bc1f1c085b7c3ee6c7683 /drivers/char/tty_io.c | |
| parent | 98523d4630865c407d3787fd592e5e399488b93b (diff) | |
| parent | 1a2c4b3147ac0645605d6def2855478861d9361b (diff) | |
| download | op-kernel-dev-15bdb5652689d51cc0316de61774d2732472d9e1.zip op-kernel-dev-15bdb5652689d51cc0316de61774d2732472d9e1.tar.gz | |
Merge branch 'serial'
* serial:
imx: Check for NULL pointer deref before calling tty_encode_baud_rate
atmel_serial: fix hang in set_termios when crtscts is enabled
MAINTAINERS: update 8250 section, give Alan Cox a name
tty: fix sanity check
pty: Narrow the race on ldisc locking
tty: fix unused warning when TCGETX is not defined
ldisc: debug aids
ldisc: Make sure the ldisc isn't active when we close it
tty: Fix leaks introduced by the shift to separate ldisc objects
Fix conflicts in drivers/char/pty.c due to earlier version of the ldisc
race narrowing.
Diffstat (limited to 'drivers/char/tty_io.c')
| -rw-r--r-- | drivers/char/tty_io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 939e198..a3afa0c 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -1263,7 +1263,9 @@ static int tty_reopen(struct tty_struct *tty) tty->count++; tty->driver = driver; /* N.B. why do this every time?? */ + mutex_lock(&tty->ldisc_mutex); WARN_ON(!test_bit(TTY_LDISC, &tty->flags)); + mutex_unlock(&tty->ldisc_mutex); return 0; } |
