From: Tom Knot <tomasknot@gmail.com>
Date: Mon, 25 Jun 2018 19:02:00 +0000 (+0200)
Subject: Manually hold the port TX lock
X-Git-Url: http://git.graph-it.com/?a=commitdiff_plain;h=e0d03e850ce5c5957546c550e9a0e3a099bac324;p=graphit%2Funipi-kernel.git

Manually hold the port TX lock
---

diff --git a/modules/unipi/src/unipi_uart.c b/modules/unipi/src/unipi_uart.c
index 1dead89..7c0cd74 100644
--- a/modules/unipi/src/unipi_uart.c
+++ b/modules/unipi/src/unipi_uart.c
@@ -77,6 +77,7 @@ void neuronspi_uart_tx_proc(struct kthread_work *ws)
 	    (port->port.rs485.delay_rts_before_send > 0)) {
 		msleep(port->port.rs485.delay_rts_before_send);
 	}
+	spin_lock(&port->port.lock);
 	neuronspi_uart_handle_tx(port);
 }
 
@@ -352,10 +353,10 @@ void neuronspi_uart_handle_tx(struct neuronspi_port *port)
 	spin_unlock(&port->tx_lock);
 
 	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) {
-		spin_lock(&port->port.lock);
 		uart_write_wakeup(&port->port);
-		spin_unlock(&port->port.lock);
 	}
+
+	spin_unlock(&port->port.lock);
 }
 
 void neuronspi_uart_handle_irq(struct neuronspi_uart_data *uart_data, u32 portno)
diff --git a/version.txt b/version.txt
index dc4c93f..b989a46 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:54(308ad0d) LatestCommit:Mon Jun 25 20:47:37 CEST 2018
+Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:55(3f2d211) LatestCommit:Mon Jun 25 21:02:00 CEST 2018