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 <[email protected]>
Signed-of-by: Felipe Balbi <[email protected]>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 3f3d6f217abeca08f589a793ea430feb5bbe1b92..e07eddbb3f8c806853cb6150e26b4695fe9ef25a 100644 (file)
--- 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;