aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Jun <B47624@freescale.com>2014-08-28 09:44:11 -0400
committerFelipe Balbi <balbi@ti.com>2014-09-02 10:16:45 -0400
commitbe0a8887bb931af0e21531da20c41533effbb0d6 (patch)
treeca28abb67c063045c767e0ab385043e5f803754d
parentd3102a5eaac708ab83fede0986f90e9971be55d3 (diff)
usb: gadget: composite: dequeue cdev->req before free its buffer
commit f226708(usb: gadget: composite: dequeue cdev->req before free it in composite_dev_cleanup) fixed a bug: free the usb request(i.e. cdev->req) but does not dequeue it beforehand. This fix is not proper enough because it dequeues the request after free its data buffer, considering the hardware can access the buffer's memory anytime before the request's complettion rountine runs, and usb_ep_dequeue always call the complettion rountine before it returns, so the best way is to dequeue the request before free its buffer. Suggested-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Li Jun <b47624@freescale.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/composite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 6935a822ce2b..4514e73d9e70 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1955,8 +1955,8 @@ void composite_dev_cleanup(struct usb_composite_dev *cdev)
1955 usb_ep_free_request(cdev->gadget->ep0, cdev->os_desc_req); 1955 usb_ep_free_request(cdev->gadget->ep0, cdev->os_desc_req);
1956 } 1956 }
1957 if (cdev->req) { 1957 if (cdev->req) {
1958 kfree(cdev->req->buf);
1959 usb_ep_dequeue(cdev->gadget->ep0, cdev->req); 1958 usb_ep_dequeue(cdev->gadget->ep0, cdev->req);
1959 kfree(cdev->req->buf);
1960 usb_ep_free_request(cdev->gadget->ep0, cdev->req); 1960 usb_ep_free_request(cdev->gadget->ep0, cdev->req);
1961 } 1961 }
1962 cdev->next_string_id = 0; 1962 cdev->next_string_id = 0;