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

USB: sierra: do not resume I/O on closing ports

Use tty-port initialised flag rather than private flag to determine when
port is closing down.

Since the tty-port flag is set prior to dropping DTR/RTS (when HUPCL is
set) this avoid submitting the read urbs when resuming the interface in
dtr_rts() only to immediately kill them again in shutdown().
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0287d5c5
...@@ -316,7 +316,6 @@ struct sierra_port_private { ...@@ -316,7 +316,6 @@ struct sierra_port_private {
int dsr_state; int dsr_state;
int dcd_state; int dcd_state;
int ri_state; int ri_state;
unsigned int opened:1;
}; };
static int sierra_send_setup(struct usb_serial_port *port) static int sierra_send_setup(struct usb_serial_port *port)
...@@ -769,8 +768,11 @@ static void sierra_close(struct usb_serial_port *port) ...@@ -769,8 +768,11 @@ static void sierra_close(struct usb_serial_port *port)
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
/*
* Need to take susp_lock to make sure port is not already being
* resumed, but no need to hold it due to ASYNC_INITIALIZED.
*/
spin_lock_irq(&intfdata->susp_lock); spin_lock_irq(&intfdata->susp_lock);
portdata->opened = 0;
if (--intfdata->open_ports == 0) if (--intfdata->open_ports == 0)
serial->interface->needs_remote_wakeup = 0; serial->interface->needs_remote_wakeup = 0;
spin_unlock_irq(&intfdata->susp_lock); spin_unlock_irq(&intfdata->susp_lock);
...@@ -826,7 +828,6 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -826,7 +828,6 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
goto err_submit; goto err_submit;
spin_lock_irq(&intfdata->susp_lock); spin_lock_irq(&intfdata->susp_lock);
portdata->opened = 1;
if (++intfdata->open_ports == 1) if (++intfdata->open_ports == 1)
serial->interface->needs_remote_wakeup = 1; serial->interface->needs_remote_wakeup = 1;
spin_unlock_irq(&intfdata->susp_lock); spin_unlock_irq(&intfdata->susp_lock);
...@@ -1025,16 +1026,14 @@ static int sierra_resume(struct usb_serial *serial) ...@@ -1025,16 +1026,14 @@ static int sierra_resume(struct usb_serial *serial)
{ {
struct usb_serial_port *port; struct usb_serial_port *port;
struct sierra_intf_private *intfdata = usb_get_serial_data(serial); struct sierra_intf_private *intfdata = usb_get_serial_data(serial);
struct sierra_port_private *portdata;
int ec = 0; int ec = 0;
int i, err; int i, err;
spin_lock_irq(&intfdata->susp_lock); spin_lock_irq(&intfdata->susp_lock);
for (i = 0; i < serial->num_ports; i++) { for (i = 0; i < serial->num_ports; i++) {
port = serial->port[i]; port = serial->port[i];
portdata = usb_get_serial_port_data(port);
if (!portdata || !portdata->opened) if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
continue; continue;
err = sierra_submit_delayed_urbs(port); err = sierra_submit_delayed_urbs(port);
......
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