From 14bfec141efa94b75f4c1fd2ab14006e695763ba Mon Sep 17 00:00:00 2001 From: Takashi Yoshii Date: Fri, 16 Nov 2012 10:53:11 +0900 Subject: [PATCH] --- yaml --- r: 338431 b: refs/heads/master c: 63f7ad115ef35b711f3ae2b46a07acbf1ca3bdfd h: refs/heads/master i: 338429: 993fc0d979a7fe5b6f358ef9fb51384ceaf8e99c 338427: f027220e9bd3f350d0315e6e8c8415c7ec77127b 338423: c82044ee93c9c3c61d3279eaea53cb717ab90a5c 338415: 1b6cf9b69a2b0bd520d5a2e381c7bbb02f02f2a9 338399: 771fefc2134fd2bc20ef647e057bb49b93e6c828 338367: c3036f4044a955925dbb199cf6a31ac5d68d3e1f 338303: 0b7b6347e1980ea0477a76af6b3abe0276901a72 338175: ed0f449cc687ef2cb5e9c243be0b743aea2b91b9 337919: 69910e8087cd05a8058aafc312ec50b7273ccc8a v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/sh-sci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b6b2ee17f8f2..a0686d0e2a09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d482cc353bd0391730730b26e4c2938dc90e477 +refs/heads/master: 63f7ad115ef35b711f3ae2b46a07acbf1ca3bdfd diff --git a/trunk/drivers/tty/serial/sh-sci.c b/trunk/drivers/tty/serial/sh-sci.c index a54c47d0fd63..c2d359cba55d 100644 --- a/trunk/drivers/tty/serial/sh-sci.c +++ b/trunk/drivers/tty/serial/sh-sci.c @@ -485,7 +485,7 @@ static int sci_txfill(struct uart_port *port) reg = sci_getreg(port, SCTFDR); if (reg->size) - return serial_port_in(port, SCTFDR) & 0xff; + return serial_port_in(port, SCTFDR) & ((port->fifosize << 1) - 1); reg = sci_getreg(port, SCFDR); if (reg->size) @@ -505,7 +505,7 @@ static int sci_rxfill(struct uart_port *port) reg = sci_getreg(port, SCRFDR); if (reg->size) - return serial_port_in(port, SCRFDR) & 0xff; + return serial_port_in(port, SCRFDR) & ((port->fifosize << 1) - 1); reg = sci_getreg(port, SCFDR); if (reg->size)