X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fserial%2Fnwpserial.c;h=e1ab8ec0a4a64f86326494ee14112da85dc2d69b;hb=ee84b8243b07c33a5c8aed42b4b2da60cb16d1d2;hp=9e150b19d72678d6592a50cb34f6d2da29d899c3;hpb=951c4df5b7703137bf4eee002d98d083fbc890cc;p=safe%2Fjmp%2Flinux-2.6 diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c index 9e150b1..e1ab8ec 100644 --- a/drivers/serial/nwpserial.c +++ b/drivers/serial/nwpserial.c @@ -126,7 +126,7 @@ static void nwpserial_config_port(struct uart_port *port, int flags) static irqreturn_t nwpserial_interrupt(int irq, void *dev_id) { struct nwpserial_port *up = dev_id; - struct tty_struct *tty = up->port.info->port.tty; + struct tty_struct *tty = up->port.state->port.tty; irqreturn_t ret; unsigned int iir; unsigned char ch; @@ -261,7 +261,7 @@ static void nwpserial_start_tx(struct uart_port *port) struct nwpserial_port *up; struct circ_buf *xmit; up = container_of(port, struct nwpserial_port, port); - xmit = &up->port.info->xmit; + xmit = &up->port.state->xmit; if (port->x_char) { nwpserial_putchar(up, up->port.x_char);