From 653fbafa7cf4a1c70403f48c1195b26822420353 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 29 Jul 2010 11:46:32 +0200 Subject: [PATCH] --- yaml --- r: 207939 b: refs/heads/master c: bf9c1fca9ae9a79ed209e7ab2c10b3862f3f6f72 h: refs/heads/master i: 207937: 87126cd13f62eea3448874d7457d50c60f42d2d5 207935: 1dfc50f0b540ca5884e86c2ada2a4093c1960472 v: v3 --- [refs] | 2 +- trunk/drivers/char/nozomi.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 425525acb0bf..cf8f4ecc794c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee78bb95b7bea08b7774a02073ea2bb45611a9e1 +refs/heads/master: bf9c1fca9ae9a79ed209e7ab2c10b3862f3f6f72 diff --git a/trunk/drivers/char/nozomi.c b/trunk/drivers/char/nozomi.c index 21ae1b158b3b..18af923093c3 100644 --- a/trunk/drivers/char/nozomi.c +++ b/trunk/drivers/char/nozomi.c @@ -1612,6 +1612,7 @@ static int ntty_install(struct tty_driver *driver, struct tty_struct *tty) if (ret == 0) { tty_driver_kref_get(driver); tty->count++; + tty->driver_data = port; driver->ttys[tty->index] = tty; } return ret; @@ -1640,7 +1641,7 @@ static int ntty_activate(struct tty_port *tport, struct tty_struct *tty) static int ntty_open(struct tty_struct *tty, struct file *filp) { - struct port *port = get_port_by_tty(tty); + struct port *port = tty->driver_data; return tty_port_open(&port->port, tty, filp); }