OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Commit 8b6ff84c2d ("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: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geert Uytterhoeven 2015-08-21 20:02:35 +02:00 committed by Greg Kroah-Hartman
parent 4205463ce1
commit e0a12a27e8
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/serial/sh-sci.c
View File

@ -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)