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

Commit be0278cc authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: ftdi_sio: clean up device initialisation 



Do not use zeroed termios data to determine when to unconditionally
configure the device at open.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc43ff92

drivers/usb/serial/ftdi_sio.c

+2 −5
Original line number Diff line number Diff line
@@ -1842,7 +1842,6 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port) 


static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)

{

	struct ktermios dummy;

	struct usb_device *dev = port->serial->dev;

	struct ftdi_private *priv = usb_get_serial_port_data(port);
@@ -1858,10 +1857,8 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port) 
	   This is same behaviour as serial.c/rs_open() - Kuba */



	/* ftdi_set_termios  will send usb control messages */

	if (tty) {

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

		ftdi_set_termios(tty, port, &dummy);

	}

	if (tty)

		ftdi_set_termios(tty, port, NULL);



	return usb_serial_generic_open(tty, port);

}