aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/f_thor.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-08-10 07:21:02 -0400
committerTom Rini <trini@konsulko.com>2018-08-10 07:21:02 -0400
commitcdec3ea7e4b80856718a019251d4df7d0db142d0 (patch)
treefd449a86607279863a0a94df5c6df9149beacea5 /drivers/usb/gadget/f_thor.c
parentf05ebbf47a9dc863ff4bb084649ecb34d728b5f2 (diff)
parent28a5c88043c80a38040abde957fbe1755b796912 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/gadget/f_thor.c')
-rw-r--r--drivers/usb/gadget/f_thor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 1aa6be44bb..8b3b19feaf 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -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;
}