Commit a6e54319 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

n_tty: Untangle read completion variables 



Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6c8dbe6

drivers/tty/n_tty.c

+2 −6
Original line number Diff line number Diff line
@@ -1801,20 +1801,16 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 
	minimum = time = 0;

	timeout = MAX_SCHEDULE_TIMEOUT;

	if (!ldata->icanon) {

		time = (HZ / 10) * TIME_CHAR(tty);

		minimum = MIN_CHAR(tty);

		if (minimum) {

			time = (HZ / 10) * TIME_CHAR(tty);

			if (time)

				ldata->minimum_to_wake = 1;

			else if (!waitqueue_active(&tty->read_wait) ||

				 (ldata->minimum_to_wake > minimum))

				ldata->minimum_to_wake = minimum;

		} else {

			timeout = 0;

			if (time) {

				timeout = time;

				time = 0;

			}

			timeout = (HZ / 10) * TIME_CHAR(tty);

			ldata->minimum_to_wake = minimum = 1;

		}

	}