summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2017-03-10 07:05:23 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-10 08:43:27 +0100
commit939d3a7684ed3138f5e2bfff7cd2876c1e050ca8 (patch)
treef890adfc658c4c80a4d8e73f843bf2230c5b6a46 /drivers
parente3dda8553eea825e11df4aef80407c66eb2c0df8 (diff)
downloadbarebox-939d3a7684ed3138f5e2bfff7cd2876c1e050ca8.tar.gz
barebox-939d3a7684ed3138f5e2bfff7cd2876c1e050ca8.tar.xz
fastboot: abort autoboot timeout when fastboot gadget is activated
This patch adds a call to "console_countdown_abort()" to abort a currently or upcoming running console timeout. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/f_fastboot.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 974b0b32eb..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>
@@ -815,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;