1 files changed, 36 insertions, 7 deletions

diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 9c014e2ecd68..eb95aecc0015 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -261,7 +261,8 @@ int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port,
                                 intfdata->in_flight--;
                                 spin_unlock_irqrestore(&intfdata->susp_lock,
                                                        flags);
-                                continue;
+                                usb_autopm_put_interface_async(port->serial->interface);
+                                break;
                         }
                 }
 
@@ -308,11 +309,16 @@ static void usb_wwan_indat_callback(struct urb *urb)
                 /* Resubmit urb so we continue receiving */
                 if (status != -ESHUTDOWN) {
                         err = usb_submit_urb(urb, GFP_ATOMIC);
-                        if (err && err != -EPERM)
-                                printk(KERN_ERR "%s: resubmit read urb failed. "
-                                       "(%d)", __func__, err);
-                        else
+                        if (err) {
+                                if (err != -EPERM) {
+                                        printk(KERN_ERR "%s: resubmit read urb failed. "
+                                                "(%d)", __func__, err);
+                                        /* busy also in error unless we are killed */
+                                        usb_mark_last_busy(port->serial->dev);
+                                }
+                        } else {
                                 usb_mark_last_busy(port->serial->dev);
+                        }
                 }
 
         }
@@ -421,6 +427,7 @@ int usb_wwan_open(struct tty_struct *tty, struct usb_serial_port *port)
         spin_lock_irq(&intfdata->susp_lock);
         portdata->opened = 1;
         spin_unlock_irq(&intfdata->susp_lock);
+        /* this balances a get in the generic USB serial code */
         usb_autopm_put_interface(serial->interface);
 
         return 0;
@@ -447,7 +454,8 @@ void usb_wwan_close(struct usb_serial_port *port)
                         usb_kill_urb(portdata->in_urbs[i]);
                 for (i = 0; i < N_OUT_URB; i++)
                         usb_kill_urb(portdata->out_urbs[i]);
-                usb_autopm_get_interface(serial->interface);
+                /* balancing - important as an error cannot be handled*/
+                usb_autopm_get_interface_no_resume(serial->interface);
                 serial->interface->needs_remote_wakeup = 0;
         }
 }
@@ -661,6 +669,18 @@ int usb_wwan_suspend(struct usb_serial *serial, pm_message_t message)
 }
 EXPORT_SYMBOL(usb_wwan_suspend);
 
+static void unbusy_queued_urb(struct urb *urb, struct usb_wwan_port_private *portdata)
+{
+        int i;
+
+        for (i = 0; i < N_OUT_URB; i++) {
+                if (urb == portdata->out_urbs[i]) {
+                        clear_bit(i, &portdata->out_busy);
+                        break;
+                }
+        }
+}
+
 static void play_delayed(struct usb_serial_port *port)
 {
         struct usb_wwan_intf_private *data;
@@ -672,8 +692,17 @@ static void play_delayed(struct usb_serial_port *port)
         data = port->serial->private;
         while ((urb = usb_get_from_anchor(&portdata->delayed))) {
                 err = usb_submit_urb(urb, GFP_ATOMIC);
-                if (!err)
+                if (!err) {
                         data->in_flight++;
+                } else {
+                        /* we have to throw away the rest */
+                        do {
+                                unbusy_queued_urb(urb, portdata);
+                                //extremely dirty
+                                atomic_dec(&port->serial->interface->dev.power.usage_count);
+                        } while ((urb = usb_get_from_anchor(&portdata->delayed)));
+                        break;
+                }
         }
 }