diff options
author | Alan Cox <alan@redhat.com> | 2008-07-22 10:25:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-22 16:03:29 -0400 |
commit | f10140fbe5f97ecfeda986a12d0f1bad75642779 (patch) | |
tree | 39300f51125936aafcb2d44b6953d916b3c31630 /drivers/serial | |
parent | ed569bfb8e5d0725db11018130e44eb567d829c1 (diff) |
port_fixups: Fix ups for tty port changes
I missed the cpm_uart one. Thanks to Kumar Gala for reporting it. A double
check found samsung also needed fixing up.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 2 | ||||
-rw-r--r-- | drivers/serial/samsung.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index abe129cc927..93e407ee08b 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
@@ -209,7 +209,7 @@ static void cpm_uart_int_rx(struct uart_port *port) | |||
209 | int i; | 209 | int i; |
210 | unsigned char ch; | 210 | unsigned char ch; |
211 | u8 *cp; | 211 | u8 *cp; |
212 | struct tty_struct *tty = port->info->tty; | 212 | struct tty_struct *tty = port->info->port.tty; |
213 | struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port; | 213 | struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port; |
214 | cbd_t __iomem *bdp; | 214 | cbd_t __iomem *bdp; |
215 | u16 status; | 215 | u16 status; |
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index 4a3ecaa629e..d852f83f890 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c | |||
@@ -202,7 +202,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id) | |||
202 | { | 202 | { |
203 | struct s3c24xx_uart_port *ourport = dev_id; | 203 | struct s3c24xx_uart_port *ourport = dev_id; |
204 | struct uart_port *port = &ourport->port; | 204 | struct uart_port *port = &ourport->port; |
205 | struct tty_struct *tty = port->info->tty; | 205 | struct tty_struct *tty = port->info->port.tty; |
206 | unsigned int ufcon, ch, flag, ufstat, uerstat; | 206 | unsigned int ufcon, ch, flag, ufstat, uerstat; |
207 | int max_count = 64; | 207 | int max_count = 64; |
208 | 208 | ||