Merge remote branch 'origin' into secretlab/next-devicetree
[firefly-linux-kernel-4.4.55.git] / drivers / serial / pmac_zilog.c
index 1e43bf59c44d6ad9b8845aa8e1bffe2c01859f7c..cabbdc7ba5838bf62e1fa799a6ed2678eb650864 100644 (file)
@@ -752,8 +752,10 @@ static void pmz_break_ctl(struct uart_port *port, int break_state)
                uap->curregs[R5] = new_reg;
 
                /* NOTE: Not subject to 'transmitter active' rule. */
-               if (ZS_IS_ASLEEP(uap))
+               if (ZS_IS_ASLEEP(uap)) {
+                       spin_unlock_irqrestore(&port->lock, flags);
                        return;
+               }
                write_zsreg(uap, R5, uap->curregs[R5]);
        }