summaryrefslogtreecommitdiffstats
path: root/drivers/serial/sc26xx.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-24 08:09:26 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-24 08:09:26 +0200
commit28afe961a18f77b2249062499bdbf70fd2ec6bba (patch)
tree71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /drivers/serial/sc26xx.c
parent1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff)
parent338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff)
downloadop-kernel-dev-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip
op-kernel-dev-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz
Merge branch 'linus' into tracing/urgent
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 ae2a9e2..e0be11c 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);
OpenPOWER on IntegriCloud