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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2013-06-26 16:47:32 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель dc43ff924d
Коммит be0278ccf3
1 изменённых файлов: 2 добавлений и 5 удалений

Просмотреть файл

@ -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) static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
{ {
struct ktermios dummy;
struct usb_device *dev = port->serial->dev; struct usb_device *dev = port->serial->dev;
struct ftdi_private *priv = usb_get_serial_port_data(port); 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 */ This is same behaviour as serial.c/rs_open() - Kuba */
/* ftdi_set_termios will send usb control messages */ /* ftdi_set_termios will send usb control messages */
if (tty) { if (tty)
memset(&dummy, 0, sizeof(dummy)); ftdi_set_termios(tty, port, NULL);
ftdi_set_termios(tty, port, &dummy);
}
return usb_serial_generic_open(tty, port); return usb_serial_generic_open(tty, port);
} }