Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d971c3b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "tty: cancel delayed work before ldisc and disc_data become NULL"

parents 44ba0964 84f2a20a
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -638,6 +638,12 @@ static void tty_ldisc_kill(struct tty_struct *tty)
{
	if (!tty->ldisc)
		return;

#if defined(CONFIG_TTY_FLUSH_LOCAL_ECHO)
	if (tty->echo_delayed_work.work.func)
		cancel_delayed_work_sync(&tty->echo_delayed_work);
#endif

	/*
	 * Now kill off the ldisc
	 */