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: Claudio Scordino <claudio@evidence.eu.com> Signed-off-by: Dave Bender <codehero@gmail.com> Tested-by: Dave Bender <codehero@gmail.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Alan Cox <alan@linux.intel.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
106b5fa700
commit
dbf1115d3f
|
@ -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);
|
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
|
||||||
unsigned int mode;
|
unsigned int mode;
|
||||||
|
unsigned long flags;
|
||||||
|
|
||||||
spin_lock(&port->lock);
|
spin_lock_irqsave(&port->lock, flags);
|
||||||
|
|
||||||
/* Disable interrupts */
|
/* Disable interrupts */
|
||||||
UART_PUT_IDR(port, atmel_port->tx_done_mask);
|
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 */
|
/* Enable interrupts */
|
||||||
UART_PUT_IER(port, atmel_port->tx_done_mask);
|
UART_PUT_IER(port, atmel_port->tx_done_mask);
|
||||||
|
|
||||||
spin_unlock(&port->lock);
|
spin_unlock_irqrestore(&port->lock, flags);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue