summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-29 10:27:07 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-29 10:27:07 -0800
commit77f234f9d995c9b576b311a56f66db6837e598df (patch)
tree6dce48a0710fd05597173fe6b49a8ef482ec51f2 /drivers
parent80c72579f74fcfcd63e27c5e317091cb35bb1f12 (diff)
parenta710ce08585e920740ffc84c7f3c82f4081169cf (diff)
downloadop-kernel-dev-77f234f9d995c9b576b311a56f66db6837e598df.zip
op-kernel-dev-77f234f9d995c9b576b311a56f66db6837e598df.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/amba-pl011.c2
1 files changed, 1 insertions, 1 deletions
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 @@ 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);
OpenPOWER on IntegriCloud