diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-07 08:56:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-07 08:56:23 -0400 |
| commit | cdc7732f3737f2bb97b77eb3d7c9da344bb73612 (patch) | |
| tree | 5d3a3567a1a58335ed2f38d8228cf24483f79b14 /drivers/usb/gadget/f_thor.c | |
| parent | a6003397f7b74f7af6c21954073e046de08f43c9 (diff) | |
| parent | 49b4c5c700077e387fef61a7225f92d190ee0c45 (diff) | |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/gadget/f_thor.c')
| -rw-r--r-- | drivers/usb/gadget/f_thor.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 6346370cd6..06139ee04d 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -123,6 +123,9 @@ static int process_rqt_cmd(const struct rqt_box *rqt) send_rsp(rsp); g_dnl_unregister(); dfu_free_entities(); +#ifdef CONFIG_THOR_RESET_OFF + return RESET_DONE; +#endif run_command("reset", 0); break; case RQT_CMD_POWEROFF: @@ -728,6 +731,10 @@ int thor_handle(void) if (ret > 0) { ret = process_data(); +#ifdef CONFIG_THOR_RESET_OFF + if (ret == RESET_DONE) + break; +#endif if (ret < 0) return ret; } else { @@ -768,7 +775,7 @@ static int thor_func_bind(struct usb_configuration *c, struct usb_function *f) goto fail; } dev->req->buf = memalign(CONFIG_SYS_CACHELINE_SIZE, - gadget->ep0->maxpacket); + THOR_PACKET_SIZE); if (!dev->req->buf) { status = -ENOMEM; goto fail; |