projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.13/clock-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
tty
/
serial
/
ip22zilog.c
diff --git
a/drivers/tty/serial/ip22zilog.c
b/drivers/tty/serial/ip22zilog.c
index
cb3c81e
..
1d94205
100644
(file)
--- a/
drivers/tty/serial/ip22zilog.c
+++ b/
drivers/tty/serial/ip22zilog.c
@@
-832,7
+832,7
@@
ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag,
up->curregs[5] |= Tx8;
up->parity_mask = 0xff;
break;
- }
;
+ }
up->curregs[4] &= ~0x0c;
if (cflag & CSTOPB)
up->curregs[4] |= SB2;