Skip to content

Commit

Permalink
serial: sh-sci: Remove bogus sci_handle_fifo_overrun() call on (H)SCIF
Browse files Browse the repository at this point in the history
Commit 8b6ff84 ("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>
  • Loading branch information
Geert Uytterhoeven authored and Greg Kroah-Hartman committed Oct 4, 2015
1 parent 4205463 commit e0a12a2
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e0a12a2

Please sign in to comment.