diff --git a/[refs] b/[refs] index 96a4f4b5a72c..7d391f45b807 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7a0453ef82c1433a35ab82d874296fff68f3639 +refs/heads/master: 135066a21129760e44a51a7ef31d8c861f8ddace diff --git a/trunk/drivers/serial/sunhv.c b/trunk/drivers/serial/sunhv.c index 7f73907db7b6..378a1784ce9a 100644 --- a/trunk/drivers/serial/sunhv.c +++ b/trunk/drivers/serial/sunhv.c @@ -91,6 +91,8 @@ static struct tty_struct *receive_chars(struct uart_port *port, struct pt_regs * break; if (c == CON_BREAK) { + if (uart_handle_break(port)) + continue; saw_console_brk = 1; c = 0; }