Merge tag 'for-v3.13/clock-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / usb / class / cdc-wdm.c

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index d3318a0..4d38759 100644 (file)
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -101,6 +101,7 @@ struct wdm_device {
        struct work_struct      rxwork;
        int                     werr;
        int                     rerr;
+       int                     resp_count;
 
        struct list_head        device_list;
        int                     (*manage_power)(struct usb_interface *, int);
@@ -253,6 +254,10 @@ static void wdm_int_callback(struct urb *urb)
                        "NOTIFY_NETWORK_CONNECTION %s network",
                        dr->wValue ? "connected to" : "disconnected from");
                goto exit;
+       case USB_CDC_NOTIFY_SPEED_CHANGE:
+               dev_dbg(&desc->intf->dev, "SPEED_CHANGE received (len %u)",
+                       urb->actual_length);
+               goto exit;
        default:
                clear_bit(WDM_POLL_RUNNING, &desc->flags);
                dev_err(&desc->intf->dev,
@@ -262,9 +267,9 @@ static void wdm_int_callback(struct urb *urb)
        }
 
        spin_lock(&desc->iuspin);
-       clear_bit(WDM_READ, &desc->flags);
        responding = test_and_set_bit(WDM_RESPONDING, &desc->flags);
-       if (!responding && !test_bit(WDM_DISCONNECTING, &desc->flags)
+       if (!desc->resp_count++ && !responding
+               && !test_bit(WDM_DISCONNECTING, &desc->flags)
                && !test_bit(WDM_SUSPENDING, &desc->flags)) {
                rv = usb_submit_urb(desc->response, GFP_ATOMIC);
                dev_dbg(&desc->intf->dev, "%s: usb_submit_urb %d",
@@ -521,10 +526,36 @@ retry:
 
        desc->length -= cntr;
        /* in case we had outstanding data */
-       if (!desc->length)
+       if (!desc->length) {
                clear_bit(WDM_READ, &desc->flags);
 
-       spin_unlock_irq(&desc->iuspin);
+               if (--desc->resp_count) {
+                       set_bit(WDM_RESPONDING, &desc->flags);
+                       spin_unlock_irq(&desc->iuspin);
+
+                       rv = usb_submit_urb(desc->response, GFP_KERNEL);
+                       if (rv) {
+                               dev_err(&desc->intf->dev,
+                                       "%s: usb_submit_urb failed with result %d\n",
+                                       __func__, rv);
+                               spin_lock_irq(&desc->iuspin);
+                               clear_bit(WDM_RESPONDING, &desc->flags);
+                               spin_unlock_irq(&desc->iuspin);
+
+                               if (rv == -ENOMEM) {
+                                       rv = schedule_work(&desc->rxwork);
+                                       if (rv)
+                                               dev_err(&desc->intf->dev, "Cannot schedule work\n");
+                               } else {
+                                       spin_lock_irq(&desc->iuspin);
+                                       desc->resp_count = 0;
+                                       spin_unlock_irq(&desc->iuspin);
+                               }
+                       }
+               } else
+                       spin_unlock_irq(&desc->iuspin);
+       } else
+               spin_unlock_irq(&desc->iuspin);
 
        rv = cntr;
 
@@ -635,6 +666,9 @@ static int wdm_release(struct inode *inode, struct file *file)
                if (!test_bit(WDM_DISCONNECTING, &desc->flags)) {
                        dev_dbg(&desc->intf->dev, "wdm_release: cleanup");
                        kill_urbs(desc);
+                       spin_lock_irq(&desc->iuspin);
+                       desc->resp_count = 0;
+                       spin_unlock_irq(&desc->iuspin);
                        desc->manage_power(desc->intf, 0);
                } else {
                        /* must avoid dev_printk here as desc->intf is invalid */