]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
OMAP: serial: Remove incorrect disabling of IER interrupt
authorMark Jackson <mpfj-list@newflow.co.uk>
Thu, 15 Aug 2013 07:53:44 +0000 (08:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 16 Aug 2013 00:42:40 +0000 (17:42 -0700)
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>
drivers/tty/serial/omap-serial.c

index 2706c11873931b1e10ae5d18831875ab35714f40..2fa7b5ce2e0cf3966f046dc61e3818a46c014823 100644 (file)
@@ -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;