---

yaml --- r: 338431 b: refs/heads/master c: 63f7ad1 h: refs/heads/master i: 338429: 993fc0d 338427: f027220 338423: c82044e 338415: 1b6cf9b 338399: 771fefc 338367: c3036f4 338303: 0b7b634 338175: ed0f449 337919: 69910e8 v: v3
git-mirror · Nov 16, 2012 · 14bfec1 · 14bfec1
1 parent d2ada8a
commit 14bfec1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)