summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2013-01-18 08:25:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-18 16:05:15 -0800
commit33aeb9da1b5248c8ffce046be4e992ff5d97d529 (patch)
tree141aceb3d47d13a2274546cc840c48cff59f0a3a /drivers
parent49abd90c4bb7b35e84c430dbba6b6368786fbf62 (diff)
downloadop-kernel-dev-33aeb9da1b5248c8ffce046be4e992ff5d97d529.zip
op-kernel-dev-33aeb9da1b5248c8ffce046be4e992ff5d97d529.tar.gz
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 <thierry.reding@avionic-design.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/lpc32xx_hs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index c01b58f..dffea6b 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);
OpenPOWER on IntegriCloud