Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b3d4ef6 authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 3afb209a

drivers/serial/sh-sci.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -17,6 +17,9 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 * for more details.

 */

 */

#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)

#define SUPPORT_SYSRQ

#endif





#undef DEBUG

#undef DEBUG
@@ -49,11 +52,6 @@ 
#endif

#endif





#include <asm/sci.h>

#include <asm/sci.h>



#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)

#define SUPPORT_SYSRQ

#endif



#include "sh-sci.h"

#include "sh-sci.h"





struct sci_port {

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 tty_struct *tty = port->info->tty;

	struct sci_port *s = &sci_ports[port->line];

	struct sci_port *s = &sci_ports[port->line];





	if (uart_handle_break(port))

		return 0;



	if (!s->break_flag && status & SCxSR_BRK(port)) {

	if (!s->break_flag && status & SCxSR_BRK(port)) {

#if defined(CONFIG_CPU_SH3)

#if defined(CONFIG_CPU_SH3)

		/* Debounce break */

		/* Debounce break */