diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 11:28:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 11:28:59 -0700 |
| commit | ccfc27302cdd82529500f3712841f30a62d19aaf (patch) | |
| tree | 945667e58ce3e308f29a8a28f04e1bcd081cd9d6 /net | |
| parent | 42bf3e27e846156e9cead6f2cd6c43fa0ceb8362 (diff) | |
| parent | 178e485a0ebbfdb7165b4363d8fea2a07d650c0b (diff) | |
| download | linux-ccfc27302cdd82529500f3712841f30a62d19aaf.tar.gz linux-ccfc27302cdd82529500f3712841f30a62d19aaf.tar.bz2 linux-ccfc27302cdd82529500f3712841f30a62d19aaf.zip | |
Merge tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY fixes from Greg Kroah-Hartman:
"Here are some tty and serial driver fixes for your 3.7-rc1 tree.
Again, the UABI header file fixes, and a number of build and runtime
serial driver bugfixes that solve problems people have been reporting
(the staging driver is a tty driver, hence the fixes coming in through
this tree.)
All of these have been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
staging: dgrp: check return value of alloc_tty_driver
staging: dgrp: check for NULL pointer in (un)register_proc_table
serial/8250_hp300: Missing 8250 register interface conversion bits
UAPI: (Scripted) Disintegrate include/linux/hsi
tty: serial: sccnxp: Fix bug with unterminated platform_id list
staging: serial: dgrp: Add missing #include <linux/uaccess.h>
serial: sccnxp: Allows the driver to be compiled as a module
tty: Fix bogus "callbacks suppressed" messages
net, TTY: initialize tty->driver_data before usage
Diffstat (limited to 'net')
| -rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 95a3a7a336ba..496ce2cebcd7 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c @@ -421,6 +421,8 @@ static int ircomm_tty_install(struct tty_driver *driver, struct tty_struct *tty) hashbin_insert(ircomm_tty, (irda_queue_t *) self, line, NULL); } + tty->driver_data = self; + return tty_port_install(&self->port, driver, tty); } |