diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:44 +0100 |
| commit | e0093dcf236cdc1d4faef95189c9376ef6610ae7 (patch) | |
| tree | ad41b7daf6e194ad32b0b6a7b33e652c45bd9d38 /drivers | |
| parent | 4e11672653a4ad639ca2d2158b1266b258951f93 (diff) | |
| parent | 939d3a7684ed3138f5e2bfff7cd2876c1e050ca8 (diff) | |
| download | barebox-e0093dcf236cdc1d4faef95189c9376ef6610ae7.tar.gz barebox-e0093dcf236cdc1d4faef95189c9376ef6610ae7.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index a6192b9ebd..ef5f7ec6e0 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -36,6 +36,7 @@ #include <environment.h> #include <globalvar.h> #include <restart.h> +#include <console_countdown.h> #include <usb/ch9.h> #include <usb/gadget.h> #include <usb/fastboot.h> @@ -597,6 +598,7 @@ static void rx_handler_dl_image(struct usb_ep *ep, struct usb_request *req) if (f_fb->download_bytes >= f_fb->download_size) { req->complete = rx_handler_command; req->length = EP_BUFFER_SIZE; + close(f_fb->download_fd); fastboot_tx_print(f_fb, "INFODownloading %d bytes finished", f_fb->download_bytes); @@ -814,6 +816,8 @@ static void fb_run_command(struct usb_ep *ep, struct usb_request *req, const cha struct f_fastboot *f_fb = req->context; int i; + console_countdown_abort(); + for (i = 0; i < num_commands; i++) { if (!strcmp_l1(cmds[i].cmd, cmd)) { func_cb = cmds[i].cb; |