tty: serial: do unlock on a common path in altera_jtaguart_console_putc()

port->lock is unlocked in each branch in altera_jtaguart_console_putc(),
so do it before the "if". "status" needs not be under the lock, as the
register was already read.

Cc: Tobias Klauser <[email protected]>
Signed-off-by: Jiri Slaby <[email protected]>
Reviewed-by: Ilpo Järvinen <[email protected]>
Acked-by: Tobias Klauser <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index ac8ce418de36d606e7a9cb57a9ed5031607369e5..c2d154d78e545904a3a6ac9c2d5ede39dda9be6e 100644 (file)
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -310,11 +310,12 @@ static void altera_jtaguart_console_putc(struct uart_port *port, unsigned char c
 
        spin_lock_irqsave(&port->lock, flags);
        while (!altera_jtaguart_tx_space(port, &status)) {
+               spin_unlock_irqrestore(&port->lock, flags);
+
                if ((status & ALTERA_JTAGUART_CONTROL_AC_MSK) == 0) {
-                       spin_unlock_irqrestore(&port->lock, flags);
                        return; /* no connection activity */
                }
-               spin_unlock_irqrestore(&port->lock, flags);
+
                cpu_relax();
                spin_lock_irqsave(&port->lock, flags);
        }