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

Commit e0a12a27 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

serial: sh-sci: Remove bogus sci_handle_fifo_overrun() call on (H)SCIF 



Commit 8b6ff84c ("serial: sh-sci: Fix R-Car SCIF and HSCIF
overrun handling") added overrun handling for (H)SCIF using the SCLSR
register, but also accidentally added a bogus call to
sci_handle_fifo_overrun() in the receive interrupt path.

Remove it again.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4205463c

drivers/tty/serial/sh-sci.c

+1 −4
Original line number Diff line number Diff line
@@ -1066,11 +1066,8 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr) 
	 * DR flags

	 */

	if (((ssr_status & SCxSR_RDxF(port)) || s->chan_rx) &&

	    (scr_status & SCSCR_RIE)) {

		if (port->type == PORT_SCIF || port->type == PORT_HSCIF)

			sci_handle_fifo_overrun(port);

	    (scr_status & SCSCR_RIE))

		ret = sci_rx_interrupt(irq, ptr);

	}



	/* Error Interrupt */

	if ((ssr_status & SCxSR_ERRORS(port)) && err_enabled)