Merge branch 'master' of git://git.denx.de/u-boot-sh

- SH serial bugfix

Merge branch 'master' of git://git.denx.de/u-boot-sh
- SH serial bugfix
7f4d3c04 · Tom Rini · f766e8bc · f5ba5c90 · 7f4d3c04
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

drivers/serial/serial_sh.c drivers/serial/serial_sh.c +4 -1

未找到文件。
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -116,7 +116,10 @@ static int serial_getc_check(struct uart_port *port)
 		handle_error(port);
 	if (sci_in(port, SCLSR) & SCxSR_ORER(port))
 		handle_error(port);
-	return status & (SCIF_DR | SCxSR_RDxF(port));
+	status &= (SCIF_DR | SCxSR_RDxF(port));
+	if (status)
+		return status;
+	return scif_rxfill(port);
 }

 static int sh_serial_getc_generic(struct uart_port *port)