Commit 7cdc3355 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a283d080
...@@ -769,14 +769,7 @@ static void sierra_close(struct usb_serial_port *port) ...@@ -769,14 +769,7 @@ static void sierra_close(struct usb_serial_port *port)
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
portdata->rts_state = 0; usb_autopm_get_interface_no_resume(serial->interface);
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);
spin_lock_irq(&intfdata->susp_lock); spin_lock_irq(&intfdata->susp_lock);
portdata->opened = 0; portdata->opened = 0;
...@@ -817,11 +810,6 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -817,11 +810,6 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
portdata = usb_get_serial_port_data(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; endpoint = port->bulk_in_endpointAddress;
for (i = 0; i < portdata->num_in_urbs; i++) { for (i = 0; i < portdata->num_in_urbs; i++) {
urb = sierra_setup_urb(serial, endpoint, USB_DIR_IN, port, 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) ...@@ -837,8 +825,6 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
if (err) if (err)
goto err_submit; goto err_submit;
sierra_send_setup(port);
spin_lock_irq(&intfdata->susp_lock); spin_lock_irq(&intfdata->susp_lock);
portdata->opened = 1; portdata->opened = 1;
if (++intfdata->open_ports == 1) if (++intfdata->open_ports == 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment