diff options
author | Mark Jackson <mpfj-list@newflow.co.uk> | 2013-08-15 03:53:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-15 20:42:40 -0400 |
commit | e438ac9ade074932383bb00d51b8ded8a0ee164b (patch) | |
tree | 9ecbd3593127c6ef480ca72da0d791184b102ebf /drivers/tty/serial/omap-serial.c | |
parent | 09a5163f5c0eb0944f3a2c219acd75933f74fda2 (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/tty/serial/omap-serial.c')
-rw-r--r-- | drivers/tty/serial/omap-serial.c | 3 |
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) | |||
1327 | pm_runtime_get_sync(up->dev); | 1327 | pm_runtime_get_sync(up->dev); |
1328 | spin_lock_irqsave(&up->port.lock, flags); | 1328 | spin_lock_irqsave(&up->port.lock, flags); |
1329 | 1329 | ||
1330 | up->ier &= ~(UART_IER_RLSI | UART_IER_RDI); | ||
1331 | serial_out(up, UART_IER, up->ier); | ||
1332 | |||
1333 | /* Disable interrupts from this port */ | 1330 | /* Disable interrupts from this port */ |
1334 | mode = up->ier; | 1331 | mode = up->ier; |
1335 | up->ier = 0; | 1332 | up->ier = 0; |