summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Jackson <mpfj-list@newflow.co.uk>2013-08-15 08:53:44 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-15 17:42:40 -0700
commite438ac9ade074932383bb00d51b8ded8a0ee164b (patch)
tree9ecbd3593127c6ef480ca72da0d791184b102ebf /drivers
parent09a5163f5c0eb0944f3a2c219acd75933f74fda2 (diff)
OMAP: serial: Remove incorrect disabling of IER interrupt
The recent patch to add RS485 contained a bug whereby the IER interrupt was cleared down incorrectly. This patch fixes the problem. Signed-off-by: Mark Jackson <mpfj@newflow.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/omap-serial.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 2706c1187393..2fa7b5ce2e0c 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1327,9 +1327,6 @@ serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)
pm_runtime_get_sync(up->dev);
spin_lock_irqsave(&up->port.lock, flags);
- up->ier &= ~(UART_IER_RLSI | UART_IER_RDI);
- serial_out(up, UART_IER, up->ier);
-
/* Disable interrupts from this port */
mode = up->ier;
up->ier = 0;