projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cando' into for-linus
[linux-2.6-microblaze.git]
/
drivers
/
serial
/
pmac_zilog.c
diff --git
a/drivers/serial/pmac_zilog.c
b/drivers/serial/pmac_zilog.c
index
4eaa043
..
700e108
100644
(file)
--- 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]);
}