diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:05:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 15:05:58 +0200 |
| commit | 1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526 (patch) | |
| tree | b5691dd5aa48ac32fdbaef44afcbcc92f01592d3 /drivers/serial/ip22zilog.c | |
| parent | 32172561889868c0ea422ea8570f0413963a815f (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/paravirt-spinlocks
Diffstat (limited to 'drivers/serial/ip22zilog.c')
| -rw-r--r-- | drivers/serial/ip22zilog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c index 9c95bc0398a..0d9acbd0bb7 100644 --- a/drivers/serial/ip22zilog.c +++ b/drivers/serial/ip22zilog.c @@ -257,8 +257,8 @@ static struct tty_struct *ip22zilog_receive_chars(struct uart_ip22zilog_port *up tty = NULL; if (up->port.info != NULL && - up->port.info->tty != NULL) - tty = up->port.info->tty; + up->port.info->port.tty != NULL) + tty = up->port.info->port.tty; for (;;) { ch = readb(&channel->control); |