From 7a0a735a5c1db0e0b1816300c8ad211326bfcde6 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Mon, 23 Sep 2013 17:01:15 +0800 Subject: [PATCH] discover: clear default_timeout waiter on timeout We don't want cancel_default to try to remove an already-removed waiter. Signed-off-by: Jeremy Kerr --- discover/device-handler.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/discover/device-handler.c b/discover/device-handler.c index 02ae688..95d2039 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -327,6 +327,8 @@ static int default_timeout(void *arg) return 0; } + handler->timeout_waiter = NULL; + pb_log("Timeout expired, booting default option %s\n", opt->option->id); boot(handler, handler->default_boot_option, NULL, -- 2.39.2