git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'origin' into for-linus
[pandora-kernel.git]
/
drivers
/
serial
/
cpm_uart
/
cpm_uart_core.c
diff --git
a/drivers/serial/cpm_uart/cpm_uart_core.c
b/drivers/serial/cpm_uart/cpm_uart_core.c
index
f8df068
..
8d349b2
100644
(file)
--- a/
drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/
drivers/serial/cpm_uart/cpm_uart_core.c
@@
-244,7
+244,7
@@
static void cpm_uart_int_rx(struct uart_port *port)
int i;
unsigned char ch;
u8 *cp;
- struct tty_struct *tty = port->
info
->port.tty;
+ struct tty_struct *tty = port->
state
->port.tty;
struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
cbd_t __iomem *bdp;
u16 status;