| commit | 77f234f9d995c9b576b311a56f66db6837e598df | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Dec 29 10:27:07 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Dec 29 10:27:07 2005 -0800 |
| tree | 6dce48a0710fd05597173fe6b49a8ef482ec51f2 | |
| parent | 80c72579f74fcfcd63e27c5e317091cb35bb1f12 [diff] | |
| parent | a710ce08585e920740ffc84c7f3c82f4081169cf [diff] |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 89d7bd3..d84476e 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c
@@ -160,7 +160,7 @@ flag = TTY_FRAME; } - if (uart_handle_sysrq_char(&uap->port, ch, regs)) + if (uart_handle_sysrq_char(&uap->port, ch & 255, regs)) goto ignore_char; uart_insert_char(&uap->port, ch, UART011_DR_OE, ch, flag);