Merge master.kernel.org:/home/rmk/linux-2.6-serial

77f234f9 · Linus Torvalds · 80c72579 · a710ce08 · 77f234f9
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/serial/amba-pl011.c drivers/serial/amba-pl011.c +1 -1

未找到文件。
--- 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);