Commit cf62a1a1 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Greg Kroah-Hartman

tty: Simplify tty->count math in tty_reopen()

As notted by Jiri, tty_ldisc_reinit() shouldn't rely on tty counter.
Simplify math by increasing the counter after reinit success.

Cc: Jiri Slaby <jslaby@suse.com>
Link: lkml.kernel.org/r/<20180829022353.23568-2-dima@arista.com>
Suggested-by: default avatarJiri Slaby <jslaby@suse.com>
Reviewed-by: default avatarJiri Slaby <jslaby@suse.cz>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c96cf923
......@@ -1272,16 +1272,13 @@ static int tty_reopen(struct tty_struct *tty)
if (retval)
return retval;
tty->count++;
if (tty->ldisc)
goto out_unlock;
if (!tty->ldisc)
retval = tty_ldisc_reinit(tty, tty->termios.c_line);
tty_ldisc_unlock(tty);
retval = tty_ldisc_reinit(tty, tty->termios.c_line);
if (retval)
tty->count--;
if (retval == 0)
tty->count++;
out_unlock:
tty_ldisc_unlock(tty);
return retval;
}
......
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