Commit d904ffd6 authored by Marc Zyngier's avatar Marc Zyngier Committed by Linus Torvalds

[PATCH] Fix Specialix SX corruption

With the latest kernels, I experienced some strange corruption, some
'*****' being randomly inserted in the character flow, like this:

	ashes:~#
	ashes:~#
	a*******shes:~#
	ashes:~#
	ashes:~#

Further investigation shows that the problem was introduced during
Alan's "TTY layer buffering revamp" patch, the amount of data to be
copied being reduced after buffer allocation.  Moving the count fixup
around solves the problem.
Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Approved-by: default avatarRogier Wolff <R.E.Wolff@BitWizard.nl>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e95a9ec1
...@@ -1095,17 +1095,17 @@ static inline void sx_receive_chars (struct sx_port *port) ...@@ -1095,17 +1095,17 @@ static inline void sx_receive_chars (struct sx_port *port)
sx_dprintk (SX_DEBUG_RECEIVE, "rxop=%d, c = %d.\n", rx_op, c); sx_dprintk (SX_DEBUG_RECEIVE, "rxop=%d, c = %d.\n", rx_op, c);
/* Don't copy past the end of the hardware receive buffer */
if (rx_op + c > 0x100) c = 0x100 - rx_op;
sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c);
/* Don't copy more bytes than there is room for in the buffer */ /* Don't copy more bytes than there is room for in the buffer */
c = tty_prepare_flip_string(tty, &rp, c); c = tty_prepare_flip_string(tty, &rp, c);
sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c); sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c);
/* Don't copy past the end of the hardware receive buffer */
if (rx_op + c > 0x100) c = 0x100 - rx_op;
sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c);
/* If for one reason or another, we can't copy more data, we're done! */ /* If for one reason or another, we can't copy more data, we're done! */
if (c == 0) break; if (c == 0) break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment