summaryrefslogtreecommitdiffstats
path: root/drivers/serial/sc26xx.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-21 15:05:58 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-21 15:05:58 +0200
commit1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526 (patch)
treeb5691dd5aa48ac32fdbaef44afcbcc92f01592d3 /drivers/serial/sc26xx.c
parent32172561889868c0ea422ea8570f0413963a815f (diff)
parent14b395e35d1afdd8019d11b92e28041fad591b71 (diff)
downloadkernel-crypto-1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526.tar.gz
kernel-crypto-1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526.tar.xz
kernel-crypto-1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526.zip
Merge branch 'linus' into x86/paravirt-spinlocks
Diffstat (limited to 'drivers/serial/sc26xx.c')
-rw-r--r--drivers/serial/sc26xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sc26xx.c b/drivers/serial/sc26xx.c
index ae2a9e2df77..e0be11ceaa2 100644
--- a/drivers/serial/sc26xx.c
+++ b/drivers/serial/sc26xx.c
@@ -141,7 +141,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
u8 status;
if (port->info != NULL) /* Unopened serial console */
- tty = port->info->tty;
+ tty = port->info->port.tty;
while (limit-- > 0) {
status = READ_SC_PORT(port, SR);