From 5260ccb4bfa338bc9faff14e105c8202a91ee003 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Wed, 16 Jul 2008 21:56:29 +0100 Subject: [PATCH] --- yaml --- r: 102371 b: refs/heads/master c: b1d1619b4a53072f19e41b1def71fd223fc5d780 h: refs/heads/master i: 102369: ad01ef9844ebc639fa363e51c1abe08424a5c979 102367: 872c90ca86a138f87a1b467293a90037e0880067 v: v3 --- [refs] | 2 +- trunk/drivers/serial/atmel_serial.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c983a1277022..107b2e28b96b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e60a10844879794c7b592acf123cbf9ea0e2c0e7 +refs/heads/master: b1d1619b4a53072f19e41b1def71fd223fc5d780 diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c index c17fcd6085f3..1fee12c1f4f8 100644 --- a/trunk/drivers/serial/atmel_serial.c +++ b/trunk/drivers/serial/atmel_serial.c @@ -662,14 +662,14 @@ static void atmel_rx_from_ring(struct uart_port *port) * uart_start(), which takes the lock. */ spin_unlock(&port->lock); - tty_flip_buffer_push(port->info->tty); + tty_flip_buffer_push(port->info->port.tty); spin_lock(&port->lock); } static void atmel_rx_from_dma(struct uart_port *port) { struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); - struct tty_struct *tty = port->info->tty; + struct tty_struct *tty = port->info->port.tty; struct atmel_dma_buffer *pdc; int rx_idx = atmel_port->pdc_rx_idx; unsigned int head; @@ -794,7 +794,7 @@ static void atmel_tasklet_func(unsigned long data) static int atmel_startup(struct uart_port *port) { struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); - struct tty_struct *tty = port->info->tty; + struct tty_struct *tty = port->info->port.tty; int retval; /*