aboutsummaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorAlexandre TORGUE2016-09-15 18:42:41 +0200
committerGreg Kroah-Hartman2016-09-22 11:48:55 +0200
commit01d32d71610b0c56ce2c56bec370e275607a96e7 (patch)
treecb2a077690587c8c2273126d3c0c010b96493b86 /drivers/tty
parent3489187204eb75e5635d8836babfd0a18be613f4 (diff)
serial: stm32: fix spin_lock management
Signed-off-by: Gerald Baeza <gerald.baeza@st.com> Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/stm32-usart.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index 24c4d821472a..3b99d790fb3f 100644
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -321,6 +321,8 @@ static irqreturn_t stm32_interrupt(int irq, void *ptr)
struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;
u32 sr;
+ spin_lock(&port->lock);
+
sr = readl_relaxed(port->membase + ofs->isr);
if ((sr & USART_SR_RXNE) && !(stm32_port->rx_ch))
@@ -329,6 +331,8 @@ static irqreturn_t stm32_interrupt(int irq, void *ptr)
if ((sr & USART_SR_TXE) && !(stm32_port->tx_ch))
stm32_transmit_chars(port);
+ spin_unlock(&port->lock);
+
if (stm32_port->rx_ch)
return IRQ_WAKE_THREAD;
else