From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 23 Sep 2013 09:01:15 +0000 (+0800)
Subject: discover: clear default_timeout waiter on timeout
X-Git-Tag: v1.0.0~483
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=7a0a735a5c1db0e0b1816300c8ad211326bfcde6

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 <jk@ozlabs.org>
---

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,