|
@@ -395,7 +395,6 @@ int usb_wwan_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|
|
}
|
|
|
|
|
|
spin_lock_irq(&intfdata->susp_lock);
|
|
|
- portdata->opened = 1;
|
|
|
if (++intfdata->open_ports == 1)
|
|
|
serial->interface->needs_remote_wakeup = 1;
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
|
@@ -429,8 +428,11 @@ void usb_wwan_close(struct usb_serial_port *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);
|
|
|
- portdata->opened = 0;
|
|
|
if (--intfdata->open_ports == 0)
|
|
|
serial->interface->needs_remote_wakeup = 0;
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
|
@@ -645,11 +647,12 @@ int usb_wwan_resume(struct usb_serial *serial)
|
|
|
spin_lock_irq(&intfdata->susp_lock);
|
|
|
for (i = 0; i < serial->num_ports; 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;
|
|
|
|
|
|
+ portdata = usb_get_serial_port_data(port);
|
|
|
+
|
|
|
if (port->interrupt_in_urb) {
|
|
|
err = usb_submit_urb(port->interrupt_in_urb,
|
|
|
GFP_ATOMIC);
|