Skip to content

Commit

Permalink
[PATCH] Fix Specialix SX corruption
Browse files Browse the repository at this point in the history
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: Marc Zyngier <maz@misterjones.org>
Approved-by: Rogier Wolff <R.E.Wolff@BitWizard.nl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Marc Zyngier authored and Linus Torvalds committed Feb 27, 2006
1 parent e95a9ec commit d904ffd
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/char/sx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/* 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 */

c = tty_prepare_flip_string(tty, &rp, 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 (c == 0) break;

Expand Down

0 comments on commit d904ffd

Please sign in to comment.