Attachment #28198 for bug #65318

View | Details | Raw Unified | Return to bug 65318
Collapse All | Expand All





{
	int retval;
	size_t n;
	unsigned long flags;

	retval = 0;
	spin_lock_irqsave(&tty->read_lock, flags);
	n = min(tty->read_cnt, N_TTY_BUF_SIZE - tty->read_tail);
	n = min(*nr, n);
	spin_unlock_irqrestore(&tty->read_lock, flags);
	if (n) {
		mb();

Return to bug 65318

Lines 1143-1155 Link Here

(-)a/drivers/char/n_tty.c (-2 / +2 lines)
1143		1143
1144	{	1144	{
1145	int retval;	1145	int retval;
1146	ssize_t n;	1146	size_t n;
1147	unsigned long flags;	1147	unsigned long flags;
1148		1148
1149	retval = 0;	1149	retval = 0;
1150	spin_lock_irqsave(&tty->read_lock, flags);	1150	spin_lock_irqsave(&tty->read_lock, flags);
1151	n = min(tty->read_cnt, N_TTY_BUF_SIZE - tty->read_tail);	1151	n = min(tty->read_cnt, N_TTY_BUF_SIZE - tty->read_tail);
1152	n = min((ssize_t)*nr, n);	1152	n = min(*nr, n);
1153	spin_unlock_irqrestore(&tty->read_lock, flags);	1153	spin_unlock_irqrestore(&tty->read_lock, flags);
1154	if (n) {	1154	if (n) {
1155	mb();	1155	mb();