From: Peter Hurley <peter@hurleysoftware.com>
Date: Sun, 8 Nov 2015 18:01:17 +0000 (-0500)
Subject: tty: Remove unset_locked_termios() error message
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f658dca95075e0b6823650968edad68538494ab8;p=linux-beck.git

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: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index b41c7089bfb2..e54879d1e676 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -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);