diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 19:23:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-10 19:25:27 +0100 |
| commit | 5a22e30def8b9539576ff047adb14455ca559f07 (patch) | |
| tree | e1e76efd73b28e7ae8124383c263fcf92bcc11e0 /drivers/misc | |
| parent | Merge tag 'tty-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| parent | tty: serial: altera_uart: Add CONSOLE_POLL support (diff) | |
| download | linux-5a22e30def8b9539576ff047adb14455ca559f07.tar.xz linux-5a22e30def8b9539576ff047adb14455ca559f07.zip | |
Merge tag 'tty-3.3-rc3' tty-next
This is needed to handle the 8250 file merge mess properly for future
patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/pti.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c index 0b56e3f43573..471ff4c85cd8 100644 --- a/drivers/misc/pti.c +++ b/drivers/misc/pti.c @@ -481,13 +481,9 @@ static int pti_tty_install(struct tty_driver *driver, struct tty_struct *tty) { int idx = tty->index; struct pti_tty *pti_tty_data; - int ret = tty_init_termios(tty); + int ret = tty_standard_install(driver, tty); if (ret == 0) { - tty_driver_kref_get(driver); - tty->count++; - driver->ttys[idx] = tty; - pti_tty_data = kmalloc(sizeof(struct pti_tty), GFP_KERNEL); if (pti_tty_data == NULL) return -ENOMEM; |