aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-09-19 16:13:33 -0400
committerLive-CD User <linux@linux.site>2009-09-19 16:13:33 -0400
commit7b01478f97a671c97fad9254aa91892209b018b5 (patch)
tree78b2e1b634b01debc7aa35dcb67baeb93a9b35d0 /drivers/serial
parent016af53a6de6837e5be3da68901083ea85ebb4da (diff)
serial: introduce tty krefs
Initially just use the helper and thus krefs when we set and clear the port values. Signed-off-by: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/serial_core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 69c4e20530f5..3fd0134d36bf 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1333,7 +1333,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
1333 tty_ldisc_flush(tty); 1333 tty_ldisc_flush(tty);
1334 1334
1335 tty->closing = 0; 1335 tty->closing = 0;
1336 port->tty = NULL; 1336 tty_port_tty_set(port, NULL);
1337 1337
1338 if (port->blocked_open) { 1338 if (port->blocked_open) {
1339 if (port->close_delay) 1339 if (port->close_delay)
@@ -1431,7 +1431,7 @@ static void uart_hangup(struct tty_struct *tty)
1431 uart_shutdown(state); 1431 uart_shutdown(state);
1432 port->count = 0; 1432 port->count = 0;
1433 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags); 1433 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
1434 port->tty = NULL; 1434 tty_port_tty_set(port, NULL);
1435 wake_up_interruptible(&port->open_wait); 1435 wake_up_interruptible(&port->open_wait);
1436 wake_up_interruptible(&port->delta_msr_wait); 1436 wake_up_interruptible(&port->delta_msr_wait);
1437 } 1437 }
@@ -1639,7 +1639,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
1639 state->uart_port->state = state; 1639 state->uart_port->state = state;
1640 tty->low_latency = (state->uart_port->flags & UPF_LOW_LATENCY) ? 1 : 0; 1640 tty->low_latency = (state->uart_port->flags & UPF_LOW_LATENCY) ? 1 : 0;
1641 tty->alt_speed = 0; 1641 tty->alt_speed = 0;
1642 port->tty = tty; 1642 tty_port_tty_set(port, tty);
1643 1643
1644 /* 1644 /*
1645 * If the port is in the middle of closing, bail out now. 1645 * If the port is in the middle of closing, bail out now.