diff options
Diffstat (limited to 'drivers/serial/samsung.c')
-rw-r--r-- | drivers/serial/samsung.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index c8851a0db63a..1523e8d9ae77 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c | |||
@@ -196,7 +196,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id) | |||
196 | { | 196 | { |
197 | struct s3c24xx_uart_port *ourport = dev_id; | 197 | struct s3c24xx_uart_port *ourport = dev_id; |
198 | struct uart_port *port = &ourport->port; | 198 | struct uart_port *port = &ourport->port; |
199 | struct tty_struct *tty = port->info->port.tty; | 199 | struct tty_struct *tty = port->state->port.tty; |
200 | unsigned int ufcon, ch, flag, ufstat, uerstat; | 200 | unsigned int ufcon, ch, flag, ufstat, uerstat; |
201 | int max_count = 64; | 201 | int max_count = 64; |
202 | 202 | ||
@@ -281,7 +281,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id) | |||
281 | { | 281 | { |
282 | struct s3c24xx_uart_port *ourport = id; | 282 | struct s3c24xx_uart_port *ourport = id; |
283 | struct uart_port *port = &ourport->port; | 283 | struct uart_port *port = &ourport->port; |
284 | struct circ_buf *xmit = &port->info->xmit; | 284 | struct circ_buf *xmit = &port->state->xmit; |
285 | int count = 256; | 285 | int count = 256; |
286 | 286 | ||
287 | if (port->x_char) { | 287 | if (port->x_char) { |
@@ -992,10 +992,10 @@ static int s3c24xx_serial_cpufreq_transition(struct notifier_block *nb, | |||
992 | struct ktermios *termios; | 992 | struct ktermios *termios; |
993 | struct tty_struct *tty; | 993 | struct tty_struct *tty; |
994 | 994 | ||
995 | if (uport->info == NULL) | 995 | if (uport->state == NULL) |
996 | goto exit; | 996 | goto exit; |
997 | 997 | ||
998 | tty = uport->info->port.tty; | 998 | tty = uport->state->port.tty; |
999 | 999 | ||
1000 | if (tty == NULL) | 1000 | if (tty == NULL) |
1001 | goto exit; | 1001 | goto exit; |