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

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

tty: Remove unset_locked_termios() error message 



With the refactor of 'locked' from parameter to local,
it's now obvious locked cannot be NULL. Remove entire conditional.

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

drivers/tty/tty_ioctl.c

+0 −5
Original line number Diff line number Diff line
@@ -247,11 +247,6 @@ static void unset_locked_termios(struct tty_struct *tty, struct ktermios *old) 


#define NOSET_MASK(x, y, z) (x = ((x) & ~(z)) | ((y) & (z)))



	if (!locked) {

		printk(KERN_WARNING "Warning?!? termios_locked is NULL.\n");

		return;

	}



	NOSET_MASK(termios->c_iflag, old->c_iflag, locked->c_iflag);

	NOSET_MASK(termios->c_oflag, old->c_oflag, locked->c_oflag);

	NOSET_MASK(termios->c_cflag, old->c_cflag, locked->c_cflag);