summaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_io.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2015-11-08 13:01:11 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-13 19:59:48 -0800
commit25080652a2d4a6d27a51fc1412e258f467174615 (patch)
treee4e9f013411b45ed604c16507ceeb2add18a847a /drivers/tty/tty_io.c
parent076fe30334557d69c8f11db1f3f192f4ae448686 (diff)
downloadlinux-25080652a2d4a6d27a51fc1412e258f467174615.tar.gz
linux-25080652a2d4a6d27a51fc1412e258f467174615.tar.bz2
linux-25080652a2d4a6d27a51fc1412e258f467174615.zip
tty: core: Remove redundant oom message
kmalloc() already emits a diagnostic for failed allocations; remove tty-specific message. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r--drivers/tty/tty_io.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index adc0229f6b5d..336714cf370a 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1580,10 +1580,8 @@ void tty_free_termios(struct tty_struct *tty)
tp = tty->driver->termios[idx];
if (tp == NULL) {
tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
- if (tp == NULL) {
- pr_warn("tty: no memory to save termios state.\n");
+ if (tp == NULL)
return;
- }
tty->driver->termios[idx] = tp;
}
*tp = tty->termios;