diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 17:21:47 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 17:21:47 -0700 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /drivers/serial/bcm63xx_uart.c | |
| parent | 0794ec8ce327ec74416b569b8fb1951274693700 (diff) | |
| parent | a6d52d70677e99bdb89b6921c265d0a58c22e597 (diff) | |
| download | talos-op-linux-f80ca163d65903276bec7045a484a79c0897eb2d.tar.gz talos-op-linux-f80ca163d65903276bec7045a484a79c0897eb2d.zip | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'drivers/serial/bcm63xx_uart.c')
| -rw-r--r-- | drivers/serial/bcm63xx_uart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c index beddaa6e9069..37ad0c449937 100644 --- a/drivers/serial/bcm63xx_uart.c +++ b/drivers/serial/bcm63xx_uart.c @@ -242,7 +242,7 @@ static void bcm_uart_do_rx(struct uart_port *port) * higher than fifo size anyway since we're much faster than * serial port */ max_count = 32; - tty = port->info->port.tty; + tty = port->state->port.tty; do { unsigned int iestat, c, cstat; char flag; @@ -318,7 +318,7 @@ static void bcm_uart_do_tx(struct uart_port *port) return; } - xmit = &port->info->xmit; + xmit = &port->state->xmit; if (uart_circ_empty(xmit)) goto txq_empty; |
