diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 15:16:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 15:16:17 -0400 |
commit | 507ffe4f3840ac24890a8123c702cf1b7fe4d33c (patch) | |
tree | 1046888f9db00f268a0056d7f6e427e21502f84c /drivers/tty/pty.c | |
parent | fdc719b63ae35d6a2d8a2a2c76eed813294664bf (diff) | |
parent | 45efcb2d32d35f6509543e477568842d8467035d (diff) |
Merge tag 'tty-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver update from Greg Kroah-Hartman:
"Here's the big tty/serial driver merge request for 3.10-rc1
Once again, Jiri has a number of TTY driver fixes and cleanups, and
Peter Hurley came through with a bunch of ldisc fixes that resolve a
number of reported issues. There are some other serial driver
cleanups as well.
All of these have been in the linux-next tree for a while"
* tag 'tty-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (117 commits)
tty/serial/sirf: fix MODULE_DEVICE_TABLE
serial: mxs: drop superfluous {get|put}_device
serial: mxs: fix buffer overflow
ARM: PL011: add support for extended FIFO-size of PL011-r1p5
serial_core.c: add put_device() after device_find_child()
tty: Fix unsafe bit ops in tty_throttle_safe/unthrottle_safe
serial: sccnxp: Replace pdata.init/exit with regulator API
serial: sccnxp: Do not override device name
TTY: pty, fix compilation warning
TTY: rocket, fix compilation warning
TTY: ircomm: fix DTR being raised on hang up
TTY: synclinkmp: fix DTR being raised on hang up
TTY: synclink_gt: fix DTR being raised on hang up
TTY: synclink: fix DTR being raised on hang up
serial: 8250_dw: Fix the stub for dw8250_probe_acpi()
serial: 8250_dw: Convert to devm_ioremap()
serial: 8250_dw: Set port capabilities based on CPR register
serial: 8250_dw: Let ACPI code extract the DMA client info
serial: 8250_dw: Support clk framework also with ACPI
serial: 8250_dw: Enable runtime PM
...
Diffstat (limited to 'drivers/tty/pty.c')
-rw-r--r-- | drivers/tty/pty.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index c24b4db243b9..a62798fcc014 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c | |||
@@ -405,15 +405,8 @@ err: | |||
405 | return retval; | 405 | return retval; |
406 | } | 406 | } |
407 | 407 | ||
408 | /* this is called once with whichever end is closed last */ | ||
409 | static void pty_unix98_shutdown(struct tty_struct *tty) | ||
410 | { | ||
411 | devpts_kill_index(tty->driver_data, tty->index); | ||
412 | } | ||
413 | |||
414 | static void pty_cleanup(struct tty_struct *tty) | 408 | static void pty_cleanup(struct tty_struct *tty) |
415 | { | 409 | { |
416 | tty->port->itty = NULL; | ||
417 | tty_port_put(tty->port); | 410 | tty_port_put(tty->port); |
418 | } | 411 | } |
419 | 412 | ||
@@ -627,6 +620,12 @@ static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty) | |||
627 | { | 620 | { |
628 | } | 621 | } |
629 | 622 | ||
623 | /* this is called once with whichever end is closed last */ | ||
624 | static void pty_unix98_shutdown(struct tty_struct *tty) | ||
625 | { | ||
626 | devpts_kill_index(tty->driver_data, tty->index); | ||
627 | } | ||
628 | |||
630 | static const struct tty_operations ptm_unix98_ops = { | 629 | static const struct tty_operations ptm_unix98_ops = { |
631 | .lookup = ptm_unix98_lookup, | 630 | .lookup = ptm_unix98_lookup, |
632 | .install = pty_unix98_install, | 631 | .install = pty_unix98_install, |