git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
drivers
/
serial
/
mux.c
diff --git
a/drivers/serial/mux.c
b/drivers/serial/mux.c
index
aa819d3
..
8ad1b8c
100644
(file)
--- a/
drivers/serial/mux.c
+++ b/
drivers/serial/mux.c
@@
-230,7
+230,7
@@
static void mux_read(struct uart_port *port)
continue;
}
- if (uart_handle_sysrq_char(port, data & 0xffu
, NULL
))
+ if (uart_handle_sysrq_char(port, data & 0xffu))
continue;
tty_insert_flip_char(tty, data & 0xFF, TTY_NORMAL);