Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / usb / gadget / function / f_ecm.c

diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index 4ce19b8..79b52dc 100644 (file)
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -56,6 +56,7 @@ struct f_ecm {
        struct usb_ep                   *notify;
        struct usb_request              *notify_req;
        u8                              notify_state;
+       atomic_t                        notify_count;
        bool                            is_open;
 
        /* FIXME is_open needs some irq-ish locking
@@ -384,7 +385,7 @@ static void ecm_do_notify(struct f_ecm *ecm)
        int                             status;
 
        /* notification already in flight? */
-       if (!req)
+       if (atomic_read(&ecm->notify_count))
                return;
 
        event = req->buf;
@@ -424,10 +425,10 @@ static void ecm_do_notify(struct f_ecm *ecm)
        event->bmRequestType = 0xA1;
        event->wIndex = cpu_to_le16(ecm->ctrl_id);
 
-       ecm->notify_req = NULL;
+       atomic_inc(&ecm->notify_count);
        status = usb_ep_queue(ecm->notify, req, GFP_ATOMIC);
        if (status < 0) {
-               ecm->notify_req = req;
+               atomic_dec(&ecm->notify_count);
                DBG(cdev, "notify --> %d\n", status);
        }
 }
@@ -452,17 +453,19 @@ static void ecm_notify_complete(struct usb_ep *ep, struct usb_request *req)
        switch (req->status) {
        case 0:
                /* no fault */
+               atomic_dec(&ecm->notify_count);
                break;
        case -ECONNRESET:
        case -ESHUTDOWN:
+               atomic_set(&ecm->notify_count, 0);
                ecm->notify_state = ECM_NOTIFY_NONE;
                break;
        default:
                DBG(cdev, "event %02x --> %d\n",
                        event->bNotificationType, req->status);
+               atomic_dec(&ecm->notify_count);
                break;
        }
-       ecm->notify_req = req;
        ecm_do_notify(ecm);
 }
 
@@ -909,6 +912,11 @@ static void ecm_unbind(struct usb_configuration *c, struct usb_function *f)
 
        usb_free_all_descriptors(f);
 
+       if (atomic_read(&ecm->notify_count)) {
+               usb_ep_dequeue(ecm->notify, ecm->notify_req);
+               atomic_set(&ecm->notify_count, 0);
+       }
+
        kfree(ecm->notify_req->buf);
        usb_ep_free_request(ecm->notify, ecm->notify_req);
 }