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

Commit 7e29bb4b authored by Alan Stern's avatar Alan Stern Committed by Live-CD User
Browse files

usb-serial: fix termios initialization logic 



This patch (as1288) fixes the initialization logic in
serial_install().  A new tty always needs to have a termios
initialized no matter what, not just in the case where the lower
driver will override the termios settings.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cc56cd01

drivers/usb/serial/usb-serial.c

+10 −12
Original line number Diff line number Diff line
@@ -210,21 +210,20 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty) 
	if (!try_module_get(serial->type->driver.owner))

		goto error_module_get;



	retval = usb_autopm_get_interface(serial->interface);

	if (retval)

		goto error_get_interface;



	/* If the termios setup has yet to be done */

	if (tty->driver->termios[idx] == NULL) {

	/* perform the standard setup */

	retval = tty_init_termios(tty);

	if (retval)

		goto error_init_termios;

		/* allow the driver to update it */



	retval = usb_autopm_get_interface(serial->interface);

	if (retval)

		goto error_get_interface;



	mutex_unlock(&serial->disc_mutex);



	/* allow the driver to update the settings */

	if (serial->type->init_termios)

		serial->type->init_termios(tty);

	}

	mutex_unlock(&serial->disc_mutex);



	tty->driver_data = port;
@@ -234,9 +233,8 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty) 
	driver->ttys[idx] = tty;

	return retval;



 error_init_termios:

	usb_autopm_put_interface(serial->interface);

 error_get_interface:

 error_init_termios:

	module_put(serial->type->driver.owner);

 error_module_get:

 error_no_port: