Merge branch 'master' of git://git.denx.de/u-boot-sh
- SH serial bugfix
This commit is contained in:
commit
7f4d3c0445
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user