Commit afd66db6 authored Apr 30, 2015 by Geert Uytterhoeven Committed by Greg Kroah-Hartman May 10, 2015

serial: sh-sci: Don't set SCLSR bits in the SCxSR error mask



error_mask is the union of all error indicating bits in the SCxSR
register, while overrun_mask may apply to a different register (SCLSR),
depending on the SCI variant.

Hence overrun_mask should only be ORed into error_mask if it applies to
the SCxSR register.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2e0842a1

drivers/tty/serial/sh-sci.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2323,6 +2323,7 @@ static int sci_init_single(struct platform_device *dev,
		* Make the error mask inclusive of overrun detection, if
		* supported.
		*/
		if (sci_port->overrun_reg == SCxSR)
		sci_port->error_mask \|= sci_port->overrun_mask;

		port->type = p->type;