diff options
| author |   Johan Hovold <jhovold@gmail.com> | 2014-05-26 19:23:04 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 15:04:04 -0700 |
| commit | 7cdc3355a75584f35eab89ea324375594a61e81f (patch) | |
| tree | b9fa733bad81d8c2cf851084726ad49a6628cbf6 /drivers/usb/serial | |
| parent | USB: sierra: do not resume I/O on closed ports (diff) | |
| download | linux-dev-7cdc3355a75584f35eab89ea324375594a61e81f.tar.xz linux-dev-7cdc3355a75584f35eab89ea324375594a61e81f.zip | |
USB: sierra: remove redundant modem-control requests
The tty-port implementation has already made sure that DTR/RTS have been
raised and lowered by calling dtr_rts so remove the redundant calls from
open and close.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/sierra.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index ac5e20d9bd24..3a2f5b80d875 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c @@ -769,14 +769,7 @@ static void sierra_close(struct usb_serial_port *port) portdata = usb_get_serial_port_data(port); - portdata->rts_state = 0; - portdata->dtr_state = 0; - - /* odd error handling due to pm counters */ - if (!usb_autopm_get_interface(serial->interface)) - sierra_send_setup(port); - else - usb_autopm_get_interface_no_resume(serial->interface); + usb_autopm_get_interface_no_resume(serial->interface); spin_lock_irq(&intfdata->susp_lock); portdata->opened = 0; @@ -817,11 +810,6 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port) portdata = usb_get_serial_port_data(port); - /* Set some sane defaults */ - portdata->rts_state = 1; - portdata->dtr_state = 1; - - endpoint = port->bulk_in_endpointAddress; for (i = 0; i < portdata->num_in_urbs; i++) { urb = sierra_setup_urb(serial, endpoint, USB_DIR_IN, port, @@ -837,8 +825,6 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port) if (err) goto err_submit; - sierra_send_setup(port); - spin_lock_irq(&intfdata->susp_lock); portdata->opened = 1; if (++intfdata->open_ports == 1) |