mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
serial: Fix sh-sci break interrupt/sysrq handling.
The sh-sci sci_br_interrupt() handler was failing to call in to uart_handle_break(), which was something that only the SH-3 path was doing, fix that up. Additionally, SUPPORT_SYSRQ seems to have moved down too far, move it back to the top so uart_handle_break() and friends aren't no-ops. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
3afb209a43
commit
0b3d4ef6fe
1 changed files with 6 additions and 5 deletions
|
@ -17,6 +17,9 @@
|
|||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*/
|
||||
#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
|
||||
#define SUPPORT_SYSRQ
|
||||
#endif
|
||||
|
||||
#undef DEBUG
|
||||
|
||||
|
@ -49,11 +52,6 @@
|
|||
#endif
|
||||
|
||||
#include <asm/sci.h>
|
||||
|
||||
#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
|
||||
#define SUPPORT_SYSRQ
|
||||
#endif
|
||||
|
||||
#include "sh-sci.h"
|
||||
|
||||
struct sci_port {
|
||||
|
@ -645,6 +643,9 @@ static inline int sci_handle_breaks(struct uart_port *port)
|
|||
struct tty_struct *tty = port->info->tty;
|
||||
struct sci_port *s = &sci_ports[port->line];
|
||||
|
||||
if (uart_handle_break(port))
|
||||
return 0;
|
||||
|
||||
if (!s->break_flag && status & SCxSR_BRK(port)) {
|
||||
#if defined(CONFIG_CPU_SH3)
|
||||
/* Debounce break */
|
||||
|
|
Loading…
Reference in a new issue