diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-06-26 16:47:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 01:24:33 +0200 |
| commit | be0278ccf3c05e7048cc6c7906e41bba0b41b8c7 (patch) | |
| tree | 6f064a48b5bf56403e4769a42fa73a89d4629277 /drivers/usb | |
| parent | USB: oti6858: do not call set_termios with uninitialised data (diff) | |
| download | linux-be0278ccf3c05e7048cc6c7906e41bba0b41b8c7.tar.xz linux-be0278ccf3c05e7048cc6c7906e41bba0b41b8c7.zip | |
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 7260ec660347..abcaeafa525f 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -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); } |