From: Thierry Reding Date: Fri, 18 Jan 2013 07:25:51 +0000 (+0100) Subject: serial: lpc32xx: Fix fallout from tty_port conversion X-Git-Tag: v3.9-rc1~125^2~63 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=33aeb9da1b5248c8ffce046be4e992ff5d97d529;p=linux-2.6-block.git 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 --- diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c index c01b58f3729c..dffea6b2cd7d 100644 --- a/drivers/tty/serial/lpc32xx_hs.c +++ b/drivers/tty/serial/lpc32xx_hs.c @@ -322,7 +322,7 @@ exit_tx: 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);