Merge tag 'v4.4.214' into 10

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

diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 8be8d10..a32a6a7 100644 (file)
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -57,6 +57,7 @@ struct f_ncm {
        struct usb_ep                   *notify;
        struct usb_request              *notify_req;
        u8                              notify_state;
+       atomic_t                        notify_count;
        bool                            is_open;
 
        const struct ndp_parser_opts    *parser_opts;
@@ -551,7 +552,7 @@ static void ncm_do_notify(struct f_ncm *ncm)
        int                             status;
 
        /* notification already in flight? */
-       if (!req)
+       if (atomic_read(&ncm->notify_count))
                return;
 
        event = req->buf;
@@ -591,7 +592,8 @@ static void ncm_do_notify(struct f_ncm *ncm)
        event->bmRequestType = 0xA1;
        event->wIndex = cpu_to_le16(ncm->ctrl_id);
 
-       ncm->notify_req = NULL;
+       atomic_inc(&ncm->notify_count);
+
        /*
         * In double buffering if there is a space in FIFO,
         * completion callback can be called right after the call,
@@ -601,7 +603,7 @@ static void ncm_do_notify(struct f_ncm *ncm)
        status = usb_ep_queue(ncm->notify, req, GFP_ATOMIC);
        spin_lock(&ncm->lock);
        if (status < 0) {
-               ncm->notify_req = req;
+               atomic_dec(&ncm->notify_count);
                DBG(cdev, "notify --> %d\n", status);
        }
 }
@@ -636,17 +638,19 @@ static void ncm_notify_complete(struct usb_ep *ep, struct usb_request *req)
        case 0:
                VDBG(cdev, "Notification %02x sent\n",
                     event->bNotificationType);
+               atomic_dec(&ncm->notify_count);
                break;
        case -ECONNRESET:
        case -ESHUTDOWN:
+               atomic_set(&ncm->notify_count, 0);
                ncm->notify_state = NCM_NOTIFY_NONE;
                break;
        default:
                DBG(cdev, "event %02x --> %d\n",
                        event->bNotificationType, req->status);
+               atomic_dec(&ncm->notify_count);
                break;
        }
-       ncm->notify_req = req;
        ncm_do_notify(ncm);
        spin_unlock(&ncm->lock);
 }
@@ -1660,6 +1664,11 @@ static void ncm_unbind(struct usb_configuration *c, struct usb_function *f)
        ncm_string_defs[0].id = 0;
        usb_free_all_descriptors(f);
 
+       if (atomic_read(&ncm->notify_count)) {
+               usb_ep_dequeue(ncm->notify, ncm->notify_req);
+               atomic_set(&ncm->notify_count, 0);
+       }
+
        kfree(ncm->notify_req->buf);
        usb_ep_free_request(ncm->notify, ncm->notify_req);