Skip to content

Commit

Permalink
USB: usb_wwan: do not resume I/O on closing ports
Browse files Browse the repository at this point in the history
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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed May 27, 2014
1 parent 8bb7ec6 commit b0a9aa6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 0 additions & 1 deletion drivers/usb/serial/usb-wwan.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ struct usb_wwan_port_private {
struct urb *out_urbs[N_OUT_URB];
u8 *out_buffer[N_OUT_URB];
unsigned long out_busy; /* Bit vector of URBs in use */
int opened;
struct usb_anchor delayed;

/* Settings for the port */
Expand Down
11 changes: 7 additions & 4 deletions drivers/usb/serial/usb_wwan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b0a9aa6

Please sign in to comment.