1 files changed, 22 insertions, 10 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index e72a657a6177..56419254ef75 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -573,6 +573,8 @@ static void acm_port_destruct(struct tty_port *port)
 static void acm_port_shutdown(struct tty_port *port)
 {
         struct acm *acm = container_of(port, struct acm, port);
+        struct urb *urb;
+        struct acm_wb *wb;
         int i;
 
         dev_dbg(&acm->control->dev, "%s\n", __func__);
@@ -581,6 +583,16 @@ static void acm_port_shutdown(struct tty_port *port)
         if (!acm->disconnected) {
                 usb_autopm_get_interface(acm->control);
                 acm_set_control(acm, acm->ctrlout = 0);
+
+                for (;;) {
+                        urb = usb_get_from_anchor(&acm->delayed);
+                        if (!urb)
+                                break;
+                        wb = urb->context;
+                        wb->use = 0;
+                        usb_autopm_put_interface_async(acm->control);
+                }
+
                 usb_kill_urb(acm->ctrlurb);
                 for (i = 0; i < ACM_NW; i++)
                         usb_kill_urb(acm->wb[i].urb);
@@ -648,12 +660,9 @@ static int acm_tty_write(struct tty_struct *tty,
 
         usb_autopm_get_interface_async(acm->control);
         if (acm->susp_count) {
-                if (!acm->delayed_wb)
-                        acm->delayed_wb = wb;
-                else
-                        usb_autopm_put_interface_async(acm->control);
+                usb_anchor_urb(wb->urb, &acm->delayed);
                 spin_unlock_irqrestore(&acm->write_lock, flags);
-                return count;   /* A white lie */
+                return count;
         }
         usb_mark_last_busy(acm->dev);
 
@@ -1269,6 +1278,7 @@ made_compressed_probe:
                 acm->bInterval = epread->bInterval;
         tty_port_init(&acm->port);
         acm->port.ops = &acm_port_ops;
+        init_usb_anchor(&acm->delayed);
 
         buf = usb_alloc_coherent(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
         if (!buf) {
@@ -1539,7 +1549,7 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
 static int acm_resume(struct usb_interface *intf)
 {
         struct acm *acm = usb_get_intfdata(intf);
-        struct acm_wb *wb;
+        struct urb *urb;
         int rv = 0;
 
         spin_lock_irq(&acm->read_lock);
@@ -1551,10 +1561,12 @@ static int acm_resume(struct usb_interface *intf)
         if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags)) {
                 rv = usb_submit_urb(acm->ctrlurb, GFP_ATOMIC);
 
-                if (acm->delayed_wb) {
-                        wb = acm->delayed_wb;
-                        acm->delayed_wb = NULL;
-                        acm_start_wb(acm, wb);
+                for (;;) {
+                        urb = usb_get_from_anchor(&acm->delayed);
+                        if (!urb)
+                                break;
+
+                        acm_start_wb(acm, urb->context);
                 }
 
                 /*