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

Commit b3f13deb authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds
Browse files

[PATCH] tty_io.c balance tty_ldisc_ref() 



tty_ldisc_deref() should only be called when tty_ldisc_ref() succeeds
otherwise it triggers a BUG().  There's already a function
tty_ldisc_flush() that flushes properly.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a2db8dfc

drivers/char/tty_io.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -3335,18 +3335,13 @@ static void __do_SAK(struct work_struct *work) 
	int session;

	int session;

	int		i;

	int		i;

	struct file	*filp;

	struct file	*filp;

	struct tty_ldisc *disc;

	struct fdtable *fdt;

	struct fdtable *fdt;

	

	

	if (!tty)

	if (!tty)

		return;

		return;

	session = tty->session;

	session = tty->session;

	

	

	/* We don't want an ldisc switch during this */

	tty_ldisc_flush(tty);

	disc = tty_ldisc_ref(tty);

	if (disc && disc->flush_buffer)

		disc->flush_buffer(tty);

	tty_ldisc_deref(disc);





	if (tty->driver->flush_buffer)

	if (tty->driver->flush_buffer)

		tty->driver->flush_buffer(tty);

		tty->driver->flush_buffer(tty);