]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
gadget: f_thor: fix hang-up with ctrl-c
authorSeung-Woo Kim <sw0312.kim@samsung.com>
Mon, 4 Jun 2018 06:53:39 +0000 (15:53 +0900)
committerMarek Vasut <marex@denx.de>
Wed, 8 Aug 2018 20:22:07 +0000 (22:22 +0200)
After the commit 6aae84769a0b ("gadget: f_thor: Fix memory leaks of
usb request and its buffer"), there is hang-up with ctrl-c in some
udc. It is because req of out_ep is freed before out_ep is disabled.
Fix hang-up with ctrl-c by disabling ep before free req of the ep.

Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
drivers/usb/gadget/f_thor.c

index 1aa6be44bb4d0894604dca8ad1f90e83bd0c225c..8b3b19feaf3d45dc074125ed1786a0f6a6a31051 100644 (file)
@@ -877,14 +877,14 @@ static void thor_func_disable(struct usb_function *f)
 
        /* Avoid freeing memory when ep is still claimed */
        if (dev->in_ep->driver_data) {
-               free_ep_req(dev->in_ep, dev->in_req);
                usb_ep_disable(dev->in_ep);
+               free_ep_req(dev->in_ep, dev->in_req);
                dev->in_ep->driver_data = NULL;
        }
 
        if (dev->out_ep->driver_data) {
-               usb_ep_free_request(dev->out_ep, dev->out_req);
                usb_ep_disable(dev->out_ep);
+               usb_ep_free_request(dev->out_ep, dev->out_req);
                dev->out_ep->driver_data = NULL;
        }