diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 10:16:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 10:16:42 -0700 |
commit | 87156d692afdc4c689e99380a263445217a4b76c (patch) | |
tree | 918cd55f9338626c2d354cfe8b6a66e451fedf99 /drivers/char/riscom8.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
parent | serial: drivers/serial/pmac_zilog.c: add missing unlock (diff) | |
download | linux-dev-87156d692afdc4c689e99380a263445217a4b76c.tar.xz linux-dev-87156d692afdc4c689e99380a263445217a4b76c.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
serial: drivers/serial/pmac_zilog.c: add missing unlock
serial: 8250_pnp - add Fujitsu Wacom device
tty: Fix regressions in the char driver conversion
Diffstat (limited to 'drivers/char/riscom8.c')
-rw-r--r-- | drivers/char/riscom8.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c index 0a8d1e56c993..b02332a5412f 100644 --- a/drivers/char/riscom8.c +++ b/drivers/char/riscom8.c @@ -909,6 +909,7 @@ static int rc_open(struct tty_struct *tty, struct file *filp) if (error) return error; + tty->driver_data = port; return tty_port_open(&port->port, tty, filp); } |