diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-29 19:27:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-29 19:27:07 +0100 |
| commit | 77f234f9d995c9b576b311a56f66db6837e598df (patch) | |
| tree | 6dce48a0710fd05597173fe6b49a8ef482ec51f2 /drivers | |
| parent | [PATCH] Fix recursive config dependency for SAA7134 (diff) | |
| parent | [SERIAL] Fix AMBA PL011 sysrq character handling (diff) | |
| download | linux-77f234f9d995c9b576b311a56f66db6837e598df.tar.xz linux-77f234f9d995c9b576b311a56f66db6837e598df.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers')
| -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) 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); |