Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbf1115d authored by Claudio Scordino's avatar Claudio Scordino Committed by Greg Kroah-Hartman
Browse files

atmel_serial: fix spinlock lockup in RS485 code 



Patch to fix a spinlock lockup in the driver that sometimes happens when the
tasklet starts.

Signed-off-by: default avatarClaudio Scordino <claudio@evidence.eu.com>
Signed-off-by: default avatarDave Bender <codehero@gmail.com>
Tested-by: default avatarDave Bender <codehero@gmail.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 106b5fa7

drivers/tty/serial/atmel_serial.c

+3 −2
Original line number Diff line number Diff line
@@ -212,8 +212,9 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) 
{

	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);

	unsigned int mode;

	unsigned long flags;



	spin_lock(&port->lock);

	spin_lock_irqsave(&port->lock, flags);



	/* Disable interrupts */

	UART_PUT_IDR(port, atmel_port->tx_done_mask);
@@ -244,7 +245,7 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) 
	/* Enable interrupts */

	UART_PUT_IER(port, atmel_port->tx_done_mask);



	spin_unlock(&port->lock);

	spin_unlock_irqrestore(&port->lock, flags);



}