summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 14:52:36 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 12:48:27 -0800
commit3a5c24232463b4978acf8d8668becbf515d30a36 (patch)
tree8f10b80f70b1ab34b8ed114a64314fbd21fe3b6c /arch
parent78e74d778a9b3ed80bb73b65ab16f842f48aa287 (diff)
TTY: simserial, properly refcount tty_port->tty
So that we will not be surprised in the ISR anymore. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/hp/sim/simserial.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 2cd6d23dfdee..b3ec91c9fc71 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -107,7 +107,7 @@ static void receive_chars(struct tty_struct *tty)
static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
{
struct serial_state *info = dev_id;
- struct tty_struct *tty = info->port.tty;
+ struct tty_struct *tty = tty_port_tty_get(&info->port);
if (!tty) {
printk(KERN_INFO "simrs_interrupt_single: info|tty=0 info=%p problem\n", info);
@@ -118,6 +118,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
* on inbound traffic
*/
receive_chars(tty);
+ tty_kref_put(tty);
return IRQ_HANDLED;
}
@@ -443,9 +444,9 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
*/
shutdown(tty, info);
rs_flush_buffer(tty);
- port->tty = NULL;
tty_port_close_end(port, tty);
+ tty_port_tty_set(port, NULL);
}
/*
@@ -467,7 +468,7 @@ static void rs_hangup(struct tty_struct *tty)
port->count = 0;
port->flags &= ~ASYNC_NORMAL_ACTIVE;
- port->tty = NULL;
+ tty_port_tty_set(port, NULL);
wake_up_interruptible(&port->open_wait);
}
@@ -556,7 +557,7 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
int retval;
port->count++;
- port->tty = tty;
+ tty_port_tty_set(port, tty);
tty->driver_data = info;
tty->port = port;