From: Samuel Mendoza-Jonas Date: Mon, 23 Jan 2017 03:53:08 +0000 (+1100) Subject: discover/device-handler: Cancel pending boot on reinit X-Git-Tag: v1.4.1~1 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=75e89298319041ac2cc96102c8345dc175e5e0db;ds=inline discover/device-handler: Cancel pending boot on reinit When a reinit is requested device_handler_cancel_default() is called, however as the name suggests this only cancels the boot task if it is the result of a default boot option. We also want to cancel a boot task if it was executed manually because it may have outstanding asynchronous transfers running, so explicitly cancel it during reinit. Signed-off-by: Samuel Mendoza-Jonas --- diff --git a/discover/device-handler.c b/discover/device-handler.c index a3891c4..78fb159 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -351,6 +351,12 @@ void device_handler_reinit(struct device_handler *handler) unsigned int i; device_handler_cancel_default(handler); + /* Cancel any pending non-default boot */ + if (handler->pending_boot) { + boot_cancel(handler->pending_boot); + handler->pending_boot = NULL; + handler->pending_boot_is_default = false; + } /* free unresolved boot options */ list_for_each_entry_safe(&handler->unresolved_boot_options,