diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2015-11-08 19:01:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-14 04:59:48 +0100 |
| commit | f658dca95075e0b6823650968edad68538494ab8 (patch) | |
| tree | 66a125e9c1366099a0b4162772f25fc1e949b3fc /drivers/tty/tty_ioctl.c | |
| parent | tty: core: Refactor parameters for unset_locked_termios() helper (diff) | |
| download | linux-f658dca95075e0b6823650968edad68538494ab8.tar.xz linux-f658dca95075e0b6823650968edad68538494ab8.zip | |
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>
Diffstat (limited to 'drivers/tty/tty_ioctl.c')
| -rw-r--r-- | drivers/tty/tty_ioctl.c | 5 |
1 files changed, 0 insertions, 5 deletions
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); |