Merge branch 'sh/hwblk' into sh/pm-runtime

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 8e2feb563347..4cbb87ad070a 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -662,10 +662,11 @@ static irqreturn_t sci_rx_interrupt(int irq, void *port)
 static irqreturn_t sci_tx_interrupt(int irq, void *ptr)
 {
         struct uart_port *port = ptr;
+        unsigned long flags;
 
-        spin_lock_irq(&port->lock);
+        spin_lock_irqsave(&port->lock, flags);
         sci_transmit_chars(port);
-        spin_unlock_irq(&port->lock);
+        spin_unlock_irqrestore(&port->lock, flags);
 
         return IRQ_HANDLED;
 }