diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:30:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 11:30:30 +0200 |
| commit | cce913178118b0b36742eb7544c2b38a0c957ee7 (patch) | |
| tree | 25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f /drivers/serial/pmac_zilog.c | |
| parent | d9f599e1e6d019968b35d2dc63074b9e8964fa69 (diff) | |
| parent | 4fd38e4595e2f6c9d27732c042a0e16b2753049c (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Resolve patch dependency
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 4eaa043ca2a..700e10833bf 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -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]); } |