From: Geert Uytterhoeven Date: Fri, 21 Aug 2015 18:02:35 +0000 (+0200) Subject: serial: sh-sci: Remove bogus sci_handle_fifo_overrun() call on (H)SCIF X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e0a12a27e834a71a3a21208e2e7e9f7c959def72;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git serial: sh-sci: Remove bogus sci_handle_fifo_overrun() call on (H)SCIF Commit 8b6ff84c2d445a47 ("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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 59ce9484875b..017b33cf5587 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -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)