diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-09-18 09:41:39 -0500 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-18 09:42:49 -0500 |
| commit | 72a65a0d19c16de36e970ca6981732b5e8f7f4c4 (patch) | |
| tree | 094ca21b5459d916264ca6df720a7b895248db63 /drivers/usb/gadget/composite.c | |
| parent | 5b484989a998074762281a1ae71b2d88f26f66d6 (diff) | |
| download | talos-obmc-linux-72a65a0d19c16de36e970ca6981732b5e8f7f4c4.tar.gz talos-obmc-linux-72a65a0d19c16de36e970ca6981732b5e8f7f4c4.zip | |
Revert "usb: gadget: composite: dequeue cdev->req before free its buffer"
This reverts commit be0a8887bb931af0e21531da20c41533effbb0d6.
The original commit f2267089ea17fa97b796b1b4247e3f8957655df3
(usb: gadget: composite: dequeue cdev->req before free it in
composite_dev_cleanup) ended up being reverted because it caused
more issues then fixed. We will also revert this counter part
commit so we start clean to properly add that idea back.
Cc: Li Jun <b47624@freescale.com>
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/composite.c')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 3f3d6f217abe..e07eddbb3f8c 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) usb_ep_free_request(cdev->gadget->ep0, cdev->os_desc_req); } if (cdev->req) { - usb_ep_dequeue(cdev->gadget->ep0, cdev->req); kfree(cdev->req->buf); + usb_ep_dequeue(cdev->gadget->ep0, cdev->req); usb_ep_free_request(cdev->gadget->ep0, cdev->req); } cdev->next_string_id = 0; |
