Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261910
b: refs/heads/master
c: 4b8c59a
h: refs/heads/master
v: v3
  • Loading branch information
Paul Mundt committed Jun 14, 2011
1 parent f089e12 commit 9b840ae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72b294cf76dcd6d37891387049ddbe3c25043cb8
refs/heads/master: 4b8c59a3d83e9cf2b65b16999a0c704fc72de056
10 changes: 3 additions & 7 deletions trunk/drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -734,15 +734,11 @@ static int sci_handle_fifo_overrun(struct uart_port *port)
{
struct tty_struct *tty = port->state->port.tty;
struct sci_port *s = to_sci_port(port);
struct plat_sci_reg *reg;
int copied = 0;

/*
* XXX: Technically not limited to non-SCIFs, it's simply the
* SCLSR check that is for the moment SCIF-specific. This
* probably wants to be revisited for SCIFA/B as well as for
* factoring in SCI overrun detection.
*/
if (port->type != PORT_SCIF)
reg = sci_getreg(port, SCLSR);
if (!reg->size)
return 0;

if ((sci_in(port, SCLSR) & (1 << s->cfg->overrun_bit))) {
Expand Down

0 comments on commit 9b840ae

Please sign in to comment.