Commit 7cc7ee28 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

usb serial: kill another case we pass NULL and shouldn't

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent adb5dca1
...@@ -164,6 +164,7 @@ static int usb_console_setup(struct console *co, char *options) ...@@ -164,6 +164,7 @@ static int usb_console_setup(struct console *co, char *options)
} }
if (serial->type->set_termios) { if (serial->type->set_termios) {
struct ktermios dummy;
/* build up a fake tty structure so that the open call has something /* build up a fake tty structure so that the open call has something
* to look at to get the cflag value */ * to look at to get the cflag value */
tty = kzalloc(sizeof(*tty), GFP_KERNEL); tty = kzalloc(sizeof(*tty), GFP_KERNEL);
...@@ -177,12 +178,13 @@ static int usb_console_setup(struct console *co, char *options) ...@@ -177,12 +178,13 @@ static int usb_console_setup(struct console *co, char *options)
kfree (tty); kfree (tty);
return -ENOMEM; return -ENOMEM;
} }
memset(&dummy, 0, sizeof(struct ktermios));
termios->c_cflag = cflag; termios->c_cflag = cflag;
tty->termios = termios; tty->termios = termios;
port->tty = tty; port->tty = tty;
/* set up the initial termios settings */ /* set up the initial termios settings */
serial->type->set_termios(port, NULL); serial->type->set_termios(port, &dummy);
port->tty = NULL; port->tty = NULL;
kfree (termios); kfree (termios);
kfree (tty); kfree (tty);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment