discover: clear default_timeout waiter on timeout
authorJeremy Kerr <jk@ozlabs.org>
Mon, 23 Sep 2013 09:01:15 +0000 (17:01 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Mon, 23 Sep 2013 09:01:15 +0000 (17:01 +0800)
We don't want cancel_default to try to remove an already-removed waiter.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
discover/device-handler.c

index 02ae6884db47876cffb740d86841c6f9c40afc82..95d203920d6f72bf5176c2629e7d2f4aa430a447 100644 (file)
@@ -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,