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

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

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

drivers/usb/serial/console.c

+3 −1
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ static int usb_console_setup(struct console *co, char *options) 
	}



	if (serial->type->set_termios) {

		struct ktermios dummy;

		/* build up a fake tty structure so that the open call has something

		 * to look at to get the cflag value */

		tty = kzalloc(sizeof(*tty), GFP_KERNEL);
@@ -177,12 +178,13 @@ static int usb_console_setup(struct console *co, char *options) 
			kfree (tty);

			return -ENOMEM;

		}

		memset(&dummy, 0, sizeof(struct ktermios));

		termios->c_cflag = cflag;

		tty->termios = termios;

		port->tty = tty;



		/* set up the initial termios settings */

		serial->type->set_termios(port, NULL);

		serial->type->set_termios(port, &dummy);

		port->tty = NULL;

		kfree (termios);

		kfree (tty);