From 33aeb9da1b5248c8ffce046be4e992ff5d97d529 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Fri, 18 Jan 2013 08:25:51 +0100 Subject: [PATCH] serial: lpc32xx: Fix fallout from tty_port conversion A duplicate definition of the port variable was introduced in the interrupt handler, which causes the build to break. The fix is to rename the variable to tport, which is already properly used in subsequent code. Signed-off-by: Thierry Reding Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/lpc32xx_hs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c index c01b58f3729c2..dffea6b2cd7d2 100644 --- a/drivers/tty/serial/lpc32xx_hs.c +++ b/drivers/tty/serial/lpc32xx_hs.c @@ -322,7 +322,7 @@ static void __serial_lpc32xx_tx(struct uart_port *port) static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id) { struct uart_port *port = dev_id; - struct tty_port *port = &port->state->port; + struct tty_port *tport = &port->state->port; u32 status; spin_lock(&port->lock);