diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-29 13:27:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-29 13:27:07 -0500 |
| commit | 77f234f9d995c9b576b311a56f66db6837e598df (patch) | |
| tree | 6dce48a0710fd05597173fe6b49a8ef482ec51f2 | |
| parent | 80c72579f74fcfcd63e27c5e317091cb35bb1f12 (diff) | |
| parent | a710ce08585e920740ffc84c7f3c82f4081169cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/amba-pl011.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 89d7bd3eaee3..d84476ee6592 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
| @@ -160,7 +160,7 @@ pl011_rx_chars(struct uart_amba_port *uap) | |||
| 160 | flag = TTY_FRAME; | 160 | flag = TTY_FRAME; |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | if (uart_handle_sysrq_char(&uap->port, ch, regs)) | 163 | if (uart_handle_sysrq_char(&uap->port, ch & 255, regs)) |
| 164 | goto ignore_char; | 164 | goto ignore_char; |
| 165 | 165 | ||
| 166 | uart_insert_char(&uap->port, ch, UART011_DR_OE, ch, flag); | 166 | uart_insert_char(&uap->port, ch, UART011_DR_OE, ch, flag); |