1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index dc0e1ad351f9..97576ff791db 100644
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -753,6 +753,14 @@ static void max310x_handle_tx(struct uart_port *port)
                 uart_write_wakeup(port);
 }
 
+static void max310x_start_tx(struct uart_port *port)
+{
+        struct max310x_one *one = container_of(port, struct max310x_one, port);
+
+        if (!work_pending(&one->tx_work))
+                schedule_work(&one->tx_work);
+}
+
 static irqreturn_t max310x_port_irq(struct max310x_port *s, int portno)
 {
         struct uart_port *port = &s->p[portno].port;
@@ -776,11 +784,8 @@ static irqreturn_t max310x_port_irq(struct max310x_port *s, int portno)
                 }
                 if (rxlen)
                         max310x_handle_rx(port, rxlen);
-                if (ists & MAX310X_IRQ_TXEMPTY_BIT) {
-                        mutex_lock(&s->mutex);
-                        max310x_handle_tx(port);
-                        mutex_unlock(&s->mutex);
-                }
+                if (ists & MAX310X_IRQ_TXEMPTY_BIT)
+                        max310x_start_tx(port);
         } while (1);
         return res;
 }
@@ -820,14 +825,6 @@ static void max310x_wq_proc(struct work_struct *ws)
         mutex_unlock(&s->mutex);
 }
 
-static void max310x_start_tx(struct uart_port *port)
-{
-        struct max310x_one *one = container_of(port, struct max310x_one, port);
-
-        if (!work_pending(&one->tx_work))
-                schedule_work(&one->tx_work);
-}
-
 static unsigned int max310x_tx_empty(struct uart_port *port)
 {
         unsigned int lvl, sts;