FAILED: patch "[PATCH] usb: gadget: f_hid: fix: Free out requests" failed to apply to 4.4-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
20d2ca955bd09639c7b01db5761d157c297aea0aMon Sep 17 00:00:00 2001
From: Krzysztof Opasiak <[email protected]>
Date: Thu, 19 Jan 2017 18:55:27 +0100
Subject: [PATCH] usb: gadget: f_hid: fix: Free out requests
Requests for out endpoint are allocated in bind() function but never released.
This commit ensures that all pending requests are released when we disable out endpoint.
Fixes 99c515005857 ("usb: gadget: hidg: register OUT INT endpoint for SET_REPORT")
Tested-by David Lechner <[email protected]>
Signed-off-by Krzysztof Opasiak <[email protected]>
Signed-off-by Felipe Balbi <[email protected]>
drivers/usb/gadget/function/f_hid.c +24 -8
@@ -425,20 +425,36 @@ static inline struct usb_request *hidg_alloc_ep_req(struct usb_ep *ep,static void hidg_set_report_complete (struct usb_ep *ep,struct usb_request *req) {struct f_hidg *hidg = (struct f_hidg *) req->context; +struct usb_composite_dev *cdev = hidg->func.config->cdev;struct f_hidg_req_list *req_list;unsigned long flags; - req_list =kzalloc (sizeof (*req_list),GFP_ATOMIC ); -if (!req_list) -return ; +switch (req->status) { +case 0 : + req_list =kzalloc (sizeof (*req_list),GFP_ATOMIC ); +if (!req_list) { +ERROR (cdev,"Unable to allocate mem for req_list\n" ); + goto free_req; + } - req_list->req = req; + req_list->req = req; -spin_lock_irqsave (&hidg->spinlock, flags); -list_add_tail (&req_list->list, &hidg->completed_out_req); -spin_unlock_irqrestore (&hidg->spinlock, flags); +spin_lock_irqsave (&hidg->spinlock, flags); +list_add_tail (&req_list->list, &hidg->completed_out_req); +spin_unlock_irqrestore (&hidg->spinlock, flags); -wake_up (&hidg->read_queue); +wake_up (&hidg->read_queue); +break ; +default : +ERROR (cdev,"Set report failed %d\n" , req->status); +/* FALLTHROUGH */ +case -ECONNABORTED :/* hardware forced ep reset */ +case -ECONNRESET :/* request dequeued */ +case -ESHUTDOWN :/* disconnect from host */ +free_req: +free_ep_req (ep, req); +return ; + } } static int hidg_setup(struct usb_function *f,