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

Commit 826c7bfe authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

serial: atmel: don't enable IRQs prematurely 



commit 27a826837ec9a3e94cc44bd9328b8289b0fcecd7 upstream.

The atmel_complete_tx_dma() function disables IRQs at the start
of the function by calling spin_lock_irqsave(&port->lock, flags);
There is no need to disable them a second time using the
spin_lock_irq() function and, in fact, doing so is a bug because
it will enable IRQs prematurely when we call spin_unlock_irq().

Just use spin_lock/unlock() instead without disabling or enabling
IRQs.

Fixes: 08f738be ("serial: at91: add tx dma support")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarJiri Slaby <jirislaby@kernel.org>
Acked-by: default avatarRichard Genoud <richard.genoud@gmail.com>
Link: https://lore.kernel.org/r/cb7c39a9-c004-4673-92e1-be4e34b85368@moroto.mountain


Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15d4bd0f

drivers/tty/serial/atmel_serial.c

+2 −2
Original line number Diff line number Diff line
@@ -884,11 +884,11 @@ static void atmel_complete_tx_dma(void *arg) 


	port->icount.tx += atmel_port->tx_len;



	spin_lock_irq(&atmel_port->lock_tx);

	spin_lock(&atmel_port->lock_tx);

	async_tx_ack(atmel_port->desc_tx);

	atmel_port->cookie_tx = -EINVAL;

	atmel_port->desc_tx = NULL;

	spin_unlock_irq(&atmel_port->lock_tx);

	spin_unlock(&atmel_port->lock_tx);



	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)

		uart_write_wakeup(port);